From f4d27201048c83c893d9476dd80a89bbce29a1c6 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Fri, 5 Nov 2010 00:32:03 +0000 Subject: initial commit --- README | 5 + conf/default.php | 10 ++ conf/metadata.php | 12 +++ css/_admin.css | 47 +++++++++ css/_diff.css | 65 +++++++++++++ css/_edit.css | 111 +++++++++++++++++++++ css/_footnotes.css | 28 ++++++ css/_forms.css | 82 ++++++++++++++++ css/_imgdetail.css | 32 ++++++ css/_links.css | 59 +++++++++++ css/_mediamanager.css | 216 +++++++++++++++++++++++++++++++++++++++++ css/_modal.css | 175 +++++++++++++++++++++++++++++++++ css/_recent.css | 61 ++++++++++++ css/_search.css | 93 ++++++++++++++++++ css/_toc.css | 91 +++++++++++++++++ css/basic.css | 263 ++++++++++++++++++++++++++++++++++++++++++++++++++ css/design.css | 260 +++++++++++++++++++++++++++++++++++++++++++++++++ css/includes.css | 4 + css/print.css | 1 + css/rtl.css | 146 ++++++++++++++++++++++++++++ css/structure.css | 64 ++++++++++++ detail.php | 87 +++++++++++++++++ images/bullet.png | Bin 0 -> 137 bytes images/closed.png | Bin 0 -> 165 bytes images/link_icon.gif | Bin 0 -> 942 bytes images/mail_icon.gif | Bin 0 -> 918 bytes images/open.png | Bin 0 -> 159 bytes images/windows.gif | Bin 0 -> 223 bytes lang/en/lang.php | 7 ++ lang/en/settings.php | 10 ++ main.php | 169 ++++++++++++++++++++++++++++++++ mediamanager.php | 46 +++++++++ style.ini | 60 ++++++++++++ tpl_functions.php | 25 +++++ 34 files changed, 2229 insertions(+) create mode 100644 README create mode 100644 conf/default.php create mode 100644 conf/metadata.php create mode 100644 css/_admin.css create mode 100644 css/_diff.css create mode 100644 css/_edit.css create mode 100644 css/_footnotes.css create mode 100644 css/_forms.css create mode 100644 css/_imgdetail.css create mode 100644 css/_links.css create mode 100644 css/_mediamanager.css create mode 100644 css/_modal.css create mode 100644 css/_recent.css create mode 100644 css/_search.css create mode 100644 css/_toc.css create mode 100644 css/basic.css create mode 100644 css/design.css create mode 100644 css/includes.css create mode 100644 css/print.css create mode 100644 css/rtl.css create mode 100644 css/structure.css create mode 100644 detail.php create mode 100644 images/bullet.png create mode 100644 images/closed.png create mode 100644 images/link_icon.gif create mode 100644 images/mail_icon.gif create mode 100644 images/open.png create mode 100644 images/windows.gif create mode 100644 lang/en/lang.php create mode 100644 lang/en/settings.php create mode 100644 main.php create mode 100644 mediamanager.php create mode 100644 style.ini create mode 100644 tpl_functions.php diff --git a/README b/README new file mode 100644 index 000000000..46f8187ca --- /dev/null +++ b/README @@ -0,0 +1,5 @@ +Starter Template for DokuWiki +http://www.dokuwiki.org/template:starter + +version: (devel) +author: Anika Henke diff --git a/conf/default.php b/conf/default.php new file mode 100644 index 000000000..7f1fbb246 --- /dev/null +++ b/conf/default.php @@ -0,0 +1,10 @@ + array(0,1,2)); diff --git a/css/_admin.css b/css/_admin.css new file mode 100644 index 000000000..c5d188763 --- /dev/null +++ b/css/_admin.css @@ -0,0 +1,47 @@ +/** + * This file provides styles for the Administration overview + * (?do=admin). + */ + +.dokuwiki ul.admin_tasks { + float: left; + width: 40%; + list-style-type: none; + font-size: 115%; +} + +.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; +} + +.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; +} diff --git a/css/_diff.css b/css/_diff.css new file mode 100644 index 000000000..f2be4ae54 --- /dev/null +++ b/css/_diff.css @@ -0,0 +1,65 @@ +/** + * 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", "Liberation Mono", Monaco, "Courier New", monospace; +} +.dokuwiki table.diff td.diff-blockheader { + font-weight: bold; +} +.dokuwiki table.diff td.diff-addedline { + background-color: #cfc; + color: inherit; +} +.dokuwiki table.diff td.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 new file mode 100644 index 000000000..db62dc976 --- /dev/null +++ b/css/_edit.css @@ -0,0 +1,111 @@ +/** + * This file provides styles for the edit view (?do=edit), preview + * and section edit buttons. + */ + +/* edit view +********************************************************************/ + +/*____________ toolbar ____________*/ + +.dokuwiki div.toolbar { + margin-bottom: .5em; +} +.dokuwiki div.toolbar #draft__status { + float: right; + color: __text_alt__; + background-color: inherit; +} +.dokuwiki div.toolbar #tool__bar { +} + +/* 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 { +} + +/*____________ edit textarea ____________*/ + +.dokuwiki textarea.edit { + /* should just be "width: 100%", but IE8 doesn't like it, see FS#1910 + FS#1667 */ + width: 100%; + margin-bottom: .5em; +} + +/*____________ below the textarea ____________*/ + +.dokuwiki #wiki__editbar { + overflow: hidden; + margin-bottom: .5em; +} + +/* size and wrap controls */ +.dokuwiki #wiki__editbar #size__ctl { + float: right; +} +.dokuwiki #wiki__editbar #size__ctl img { + cursor: pointer; +} + +/* edit buttons */ +.dokuwiki #wiki__editbar .editButtons { + display: inline; + margin-right: 1em; +} +.dokuwiki #wiki__editbar .editButtons input { +} + +/* summary input and minor changes checkbox */ +.dokuwiki #wiki__editbar .summary { + display: inline; +} +.dokuwiki #wiki__editbar .summary label { + vertical-align: middle; + white-space: nowrap; +} +.dokuwiki #wiki__editbar .summary label span { + vertical-align: middle; +} +.dokuwiki #wiki__editbar .summary input { +} +/* change background colour if summary is missing */ +.dokuwiki #wiki__editbar .summary input.missing { + color: __text__; + background-color: #ffcccc; +} + +/* preview +********************************************************************/ + +.dokuwiki div.preview { + background-color: __background_neu__; + color: __text__; + margin-bottom: 1.4em; + padding: .5em; + border: 1px dotted __text_neu__; +} + +/* section edit buttons +********************************************************************/ + +.dokuwiki .secedit { + float: right; + margin-top: -1.4em; +} +.dokuwiki .section_highlight { + background-color: __background_alt__ !important; + color: inherit; +} diff --git a/css/_footnotes.css b/css/_footnotes.css new file mode 100644 index 000000000..a20f2964e --- /dev/null +++ b/css/_footnotes.css @@ -0,0 +1,28 @@ +/** + * 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 new file mode 100644 index 000000000..c7dc02d62 --- /dev/null +++ b/css/_forms.css @@ -0,0 +1,82 @@ + +/* TODO */ + +/** + * This file provides styles for forms in general and specifically + * for ?do= + * - login + * - resendpwd + * - register + * - profile + * - subscribe + */ + +/* ---------------- 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 label span { + vertical-align: middle; +} + +div.dokuwiki fieldset { + width: 400px; + text-align: center; + border: 1px solid __border__; + padding: 0.5em; + margin: auto; +} + + +div.dokuwiki input.edit, +div.dokuwiki select.edit { + vertical-align: middle; +} +div.dokuwiki select.edit { + padding: 0.1em 0; +} + + +.dokuwiki input.button, +.dokuwiki button.button { + vertical-align: middle; +} + +/** + * Styles for the subscription page + */ + +form#subscribe__form { + display: block; + width: 400px; + 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/css/_imgdetail.css b/css/_imgdetail.css new file mode 100644 index 000000000..d6cc4abaf --- /dev/null +++ b/css/_imgdetail.css @@ -0,0 +1,32 @@ +/** + * This file provides styles for the image detail page (detail.php). + */ + +#dokuwiki__detail { + padding: 1em; +} +#dokuwiki__detail h1 { +} + +#dokuwiki__detail div.content { +} + +#dokuwiki__detail div.content img { + float: left; + margin-right: 1.5em; +} +#dokuwiki__detail div.content div.img_detail { + float: left; +} + +#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 { +} diff --git a/css/_links.css b/css/_links.css new file mode 100644 index 000000000..8fc6c1322 --- /dev/null +++ b/css/_links.css @@ -0,0 +1,59 @@ +/** + * This file provides styles for all types of links. + */ + +/*____________ links to wiki pages ____________*/ + +/* existing wikipage */ +.dokuwiki a.wikilink1 { + color: __existing__; + background-color: inherit; +} +/* not existing wikipage */ +.dokuwiki a.wikilink2 { + color: __missing__; + background-color: inherit; + text-decoration: none !important; +} +.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; +} + +/*____________ other link types ____________*/ + +.dokuwiki a.urlextern, +.dokuwiki a.windows, +.dokuwiki a.mail { + background-repeat: no-repeat; + background-position: 0 center; + padding-left: 17px; +} +/* external link */ +.dokuwiki a.urlextern { + background-image: url(images/link_icon.gif); +} +/* windows share */ +.dokuwiki a.windows { + background-image: url(images/windows.gif); +} +/* email link */ +.dokuwiki a.mail { + background-image: url(images/mail_icon.gif); +} + +/* icons of the following are set by dokuwiki in lib/exe/css.php */ +/* link to some embedded media */ +.dokuwiki a.mediafile { + background-position: 0 center; + padding-bottom: 0; +} +/* interwiki link */ +.dokuwiki a.interwiki { + background-position: 0 center; +} diff --git a/css/_mediamanager.css b/css/_mediamanager.css new file mode 100644 index 000000000..da1af909e --- /dev/null +++ b/css/_mediamanager.css @@ -0,0 +1,216 @@ +/** + * This file provides styles for the media manager + * (mediamanager.php). + */ + +/*____________ structure ____________*/ + +html.popup { + overflow: auto; +} + +#media__manager { + height: 100%; + overflow: hidden; +} + +#media__left { + width: 30%; + height: 100%; + overflow: auto; + position: absolute; + left: 0; + border-right: solid 1px __border__; +} +#media__left .pad { + padding: .5em; +} + +#media__right { + width: 69.7%; + height: 100%; + overflow: auto; + position: absolute; + right: 0; +} +#media__right .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; +} +#media__opts label { +} + +/*____________ tree ____________*/ + +#media__tree ul { + padding-left: .2em; +} +#media__tree ul li { + clear: left; + list-style-type: none; + list-style-image: none; + margin-left: 0; +} +#media__tree ul li img { + float: left; + padding: .5em .3em 0 0; +} +#media__tree ul li div.li { + display: inline; +} +#media__tree ul li li { + margin-left: 1.5em; +} + +/* right side +********************************************************************/ + +/*____________ upload form ____________*/ + +/* upload info */ +#media__content div.upload { + font-size: .9em; + margin-bottom: .5em; +} + +#media__content form#dw__upload, +#media__content div#dw__flashupload { + display: block; + border-bottom: solid 1px __border__; + padding-bottom: 1em; + margin-bottom: 1em; +} +#media__content form#dw__upload p { + margin-bottom: .5em; +} + +#media__content form#dw__upload label { +} +#media__content form#dw__upload label.check { +} +#media__content form#dw__upload input.check { +} +#media__content form#dw__upload input.edit { +} +#media__content form#dw__upload img { +} + +/*____________ 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; +} +#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; +} +#media__content div.detail div.thumb a { + display: block; +} +#media__content div.detail p { + margin-bottom: 0; +} + + +/*____________ media search ____________*/ + +form#dw__mediasearch { +} +form#dw__mediasearch p { +} +form#dw__mediasearch label { +} +form#dw__mediasearch label span { +} +form#dw__mediasearch input.edit { +} +form#dw__mediasearch input.button { +} + + +/* meta edit form +********************************************************************/ + +#media__content form.meta { +} + +#media__content form.meta div.metafield { + clear: left; + margin-bottom: .5em; + overflow: hidden; +} + +#media__content form.meta label { + display: block; + width: 25%; + float: left; + font-weight: bold; + clear: left; +} +#media__content form.meta .edit { + float: left; + width: 70%; + margin: 0; +} +#media__content form.meta textarea.edit { +} + +#media__content form.meta div.buttons { + clear: left; + margin: .2em 0 0 25%; +} diff --git a/css/_modal.css b/css/_modal.css new file mode 100644 index 000000000..89eb48dab --- /dev/null +++ b/css/_modal.css @@ -0,0 +1,175 @@ + +/* TODO */ + +/** + * This file provides styles for modal dialogues. + */ + +/* link wizard (opens from the link button in the edit toolbar) +********************************************************************/ + +#link__wiz { + position: absolute; + display: block; + z-index: 99; + width: 300px; + height: 250px; + padding: 0; + margin: 0; + overflow: hidden; + border: 1px solid __border__; + background-color: __background_neu__; + text-align: center; +} + +#link__wiz_header { + background-color: __background_alt__; + height: 16px; + margin-bottom: 5px; +} + +#link__wiz_close { + cursor: pointer; + margin: 0; +} + +#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__; +} + +/*FIXME maybe move to a more general style sheet*/ +.ondrag { + cursor: move; + opacity: 0.8; +} + + +/* media option wizard (opens when inserting media in the media popup) +********************************************************************/ + +/* --- popup --- */ + +#media__popup { + background-color:__background__; + display:none; + border: 1px solid __border__; + position: absolute; + width:270px; +} + +#media__popup h1 { + text-align:center; + font-weight:normal; + background-color: __background_alt__; + height: 16px; + margin-bottom: 5px; + font-size:12px; + border-bottom: 0; +} + +#media__popup p { + display:block; + line-height:14pt; + margin:0.5em; +} + +#media_nolink { + padding:4px 0; +} + +#media__popup label { + float:left; + width:9em; +} + +#media__popup .button { + margin-left:auto; + margin-right:auto; +} + +#media__popup .btnlbl { + text-align:center; +} + +#media__popup .btnlbl input { + margin:0 1em; +} + +#media__closeimg { + float:right; +} + +/* --- display options --- */ + +#media__linkopts label, +#media__nolnk { + width: 80px; + float: left; + margin-left: 10px; +} + +#media__linkopts label{ + line-height: 20px; +} + +#media__nolnk, +#media__linkopts label.long{ + margin-bottom: 8px; + line-height: 12px; +} + +#media__linkopts label.long{ + width: 150px; + float: none; +} + +#media__linkopts br { + clear: both; +} + +#media__linkopts select { + width: 60px; + margin-left: 10px; +} + +#media__linkopts input.edit { + width:50px; + margin-left:10px; +} +#media__linkopts #media__title { + width:150px; +} diff --git a/css/_recent.css b/css/_recent.css new file mode 100644 index 000000000..75d3a2da8 --- /dev/null +++ b/css/_recent.css @@ -0,0 +1,61 @@ +/** + * This file provides styles for the recent changes (?do=recent) and + * old revisions (?do=revisions). + */ + +/*____________ list of revisions / recent changes ____________*/ + +.dokuwiki #dw__recent ul li, +.dokuwiki #page__revisions ul li { + list-style: none; + margin-left: 0; +} +.dokuwiki #dw__recent ul li *, +.dokuwiki #page__revisions ul li * { + vertical-align: middle; +} +.dokuwiki #dw__recent ul li.minor, +.dokuwiki #page__revisions ul li.minor { + color: __text_alt__; + background-color: inherit; +} + +.dokuwiki #dw__recent li span.date, +.dokuwiki #page__revisions li span.date { +} +.dokuwiki #dw__recent li a.diff_link, +.dokuwiki #page__revisions li a.diff_link { + vertical-align: baseline; +} +.dokuwiki #dw__recent li a.revisions_link, +.dokuwiki #page__revisions li a.revisions_link { + vertical-align: baseline; +} +.dokuwiki #dw__recent li a.wikilink1, +.dokuwiki #dw__recent li a.wikilink2, +.dokuwiki #page__revisions li a.wikilink1, +.dokuwiki #page__revisions li a.wikilink2 { +} +.dokuwiki #dw__recent li span.sum, +.dokuwiki #page__revisions li span.sum { + font-weight: bold; +} +.dokuwiki #dw__recent li span.user, +.dokuwiki #page__revisions li span.user { +} + + +/*____________ page navigator ____________*/ + +.dokuwiki div.pagenav { + text-align: center; + margin: 1.4em 0; +} +.dokuwiki div.pagenav-prev { + display: inline; + margin-right: .5em; +} +.dokuwiki div.pagenav-next { + display: inline; + margin-left: .5em; +} diff --git a/css/_search.css b/css/_search.css new file mode 100644 index 000000000..70824fc43 --- /dev/null +++ b/css/_search.css @@ -0,0 +1,93 @@ +/** + * This file provides styles for the search results page (?do=search) + * and the AJAX search popup. + */ + +/* search results page +********************************************************************/ + +/* loading gif */ +.dokuwiki #dw__loading { +} + +/*____________ 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; +} + +/*____________ search results ____________*/ + +/* container for one search result */ +.dokuwiki div.search_result { + margin-bottom: 1.4em; +} +/* search snippet */ +.dokuwiki div.search_result div.search_snippet { + color: __text_alt__; + background-color: inherit; +} + +/* 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 { + font-weight: normal; +} +/* ellipsis separating snippets */ +.dokuwiki div.search_result .search_sep { + 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; +} + +/* .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; +} +.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/_toc.css b/css/_toc.css new file mode 100644 index 000000000..5595c521b --- /dev/null +++ b/css/_toc.css @@ -0,0 +1,91 @@ +/** + * This file provides styles for the TOC (table of contents), the + * sitemap (?do=index) and backlinks (?do=backlink). + */ + +/* toc +********************************************************************/ + +/* toc container */ +.dokuwiki div.toc { + float: right; + margin: 0 0 1.4em 1.4em; + width: 12em; +} + +/*____________ toc header ____________*/ + +.dokuwiki div.tocheader { + padding: 0.2em 0.4em; + margin-bottom: .2em; + font-weight: bold; + background-color: __background_alt__; + color: __text__; +} + +/* css arrow */ +.dokuwiki .toc span.toc_open, +.dokuwiki .toc span.toc_close { + border: .4em solid __background_alt__; + float: right; + display: block; + margin: 0 .2em 0 0; +} +.dokuwiki .toc span.toc_open span, +.dokuwiki .toc span.toc_close span { + display: none; +} +.dokuwiki .toc span.toc_open { + margin-top: .4em; + border-top: .4em solid __text__; +} +.dokuwiki .toc span.toc_close { + margin-top: 0; + border-bottom: .4em solid __text__; +} + +/*____________ toc list ____________*/ + +.dokuwiki #toc__inside { + padding: .2em .4em; + background-color: __background_alt__; + color: __text__; +} +.dokuwiki #toc__inside ul { + padding: 0; + margin: 0; +} +.dokuwiki #toc__inside ul li { + list-style: none; + padding: 0; + margin: 0; +} +.dokuwiki #toc__inside ul ul { + padding-left: 1em; +} +.dokuwiki #toc__inside ul ul li { +} +.dokuwiki #toc__inside ul li a { +} + +/* 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 { +} + + +/* sitemap (and backlinkss) +********************************************************************/ + +.dokuwiki ul.idx { + padding-left: 0; +} +.dokuwiki ul.idx li { + list-style-image: url(images/bullet.png); +} +.dokuwiki ul.idx li.open { + list-style-image: url(images/open.png); +} +.dokuwiki ul.idx li.closed { + list-style-image: url(images/closed.png); +} diff --git a/css/basic.css b/css/basic.css new file mode 100644 index 000000000..b9045dcbc --- /dev/null +++ b/css/basic.css @@ -0,0 +1,263 @@ +/** + * This file provides the most basic styles. + * + * If you integrate DokuWiki into another project, you might either + * want to integrate this file into the other project as well, or use + * the other project's basic CSS for DokuWiki instead of this one. + * + * @author Anika Henke + */ + +html { + overflow-x: auto; + overflow-y: scroll; +} +html, body { + background-color: __background__; + color: __text__; + margin: 0; + padding: 0; +} +body { + font: normal 100%/1.4 Frutiger, "Frutiger Linotype", Univers, Calibri, Myriad, "Liberation Sans", Tahoma, Geneva, "Helvetica Neue", Helvetica, Arial, sans-serif; + /* default font size: 100% => 16px; 93.75% => 15px; 87.5% => 14px; 81.25% => 13px; 75% => 12px */ + text-align: left; +} + + +/*____________ headers ____________*/ + +h1, h2, h3, h4, h5, h6, +caption, legend { + font-family: Constantia, Utopia, Lucidabright, Lucida, Georgia, serif; + font-weight: bold; + color: __text_neu__; + background-color: inherit; + padding: 0; + clear: left; /* ideally 'both', but problems with toc */ +} + +h1 { font-size: 2.25em; margin: 0 0 0.444em; } +h2 { font-size: 1.5em; margin: 0 0 0.666em; } +h3 { font-size: 1.125em; margin: 0 0 0.888em; } +h4 { font-size: 1em; margin: 0 0 1.0em; } +h5 { font-size: .875em; margin: 0 0 1.1428em; } +h6 { font-size: .75em; margin: 0 0 1.333em; } +/* bottom margin = 1 / font-size */ + + +/*____________ basic margins and paddings ____________*/ + +p, ul, ol, dl, pre, table, +hr, blockquote, fieldset, address { + margin: 0 0 1.4em 0; /* bottom margin = line-height */ + padding: 0; +} + +div { + margin: 0; + padding: 0; +} + +p, dt, dd, td, th, li { +} + + +/*____________ lists ____________*/ + +ul, ol { + padding: 0 0 0 1.5em; +} +li, dd { + padding: 0; + margin: 0 0 0 1.5em; +} +dt { + font-weight: bold; + margin: 0; + padding: 0; +} + +li ul, li ol, li dl, +dl ul, dl ol, dl dl { + margin-bottom: 0; + padding: 0; +} +li li { + font-size: 100%; +} + +ul { list-style: disc outside; } +ol { list-style: decimal outside; } +ol ol { list-style-type: lower-alpha; } +ol ol ol { list-style-type: upper-roman; } +ol ol ol ol { list-style-type: upper-alpha; } +ol ol ol ol ol { list-style-type: lower-roman; } + + +/*____________ tables ____________*/ + +table { + border-collapse: collapse; + empty-cells: show; + border-spacing: 0; + border: 1px solid __border__; +} + +caption { + caption-side: top; + text-align: left; + margin: 0 0 .3em; +} + +th, td { + padding: .3em .5em; + margin: 0; + vertical-align: top; + border: 1px solid __border__; + text-align: left; +} +th { + font-weight: bold; + background-color: __background_alt__; +} + + +/*____________ links ____________*/ + +a { +} +a:link, a:visited { + text-decoration: none; + color: #00c; /* §colour */ +} +a:link:hover, a:visited:hover, +a:link:focus, a:visited:focus, +a:link:active, a:visited:active { + text-decoration: underline; +} +a:link:focus, a:visited:focus { + outline: 1px dotted; +} +a:link:active, a:visited:active { + color: #c00; /* §colour */ +} + + +/*____________ misc ____________*/ + +img { + border-width: 0; + vertical-align: middle; + color: #666; + background-color: transparent; + font-style: italic; +} + +hr { + border-style: solid; + border-width: 1px 0 0; + text-align: center; + height: 0; + width: 100%; + clear: both; +} + +acronym, abbr { + cursor: help; + border-bottom: 1px dotted; + font-style: normal; +} + +pre, code, samp, kbd { + font: normal 1em Consolas, "Andale Mono WT", "Andale Mono", "Bitstream Vera Sans Mono", "Liberation Mono", Monaco, "Courier New", monospace; + /* same font stack should be used for ".dokuwiki table.diff td" in _diff.css */ + direction: ltr; + text-align: left; +} +pre { + overflow: auto; +} + +blockquote { + padding: 0 1.25em; + border: solid __border__; + border-width: 0 0 0 .25em; +} +q:before, q:after { + content: ''; +} + +sub, sup { + font-size: .8em; + line-height: 1; +} +sub { + vertical-align: sub; +} +sup { + vertical-align: super; +} + +/*____________ forms ____________*/ + +form { + display: inline; + margin: 0; + padding: 0; +} +fieldset { + padding: 1em 1em 0; + border: 1px solid __text_alt__; +} +legend { + margin: 0; + padding: 0 .1em; +} +label { + vertical-align: middle; + cursor: pointer; +} +input, textarea, button, +select, optgroup, option { + font: inherit; + color: inherit; + /* background-color destroys button look */ + line-height: 1; + margin: 0; + vertical-align: middle; +} +input[type=text], input[type=password], textarea { + padding: .1em; +} +input[type=radio], input[type=checkbox], input.check { + padding: 0; +} +input[type=submit], input.button, button { + cursor: pointer; +} +input[disabled], button[disabled], +input[readonly], button[readonly] { + cursor: auto; +} +optgroup { font-style: italic; font-weight: bold; } +option { font-style: normal; font-weight: normal; } + + +/*____________ general classes ____________*/ + +div.clearer { + /* additional to what's already in lib/styles/style.css: */ + font-size: 1px; + visibility: hidden; +} + +.a11y { + position: absolute; + left: -9000px; + top: -4000px; + width: 0; + height: 0; + overflow: hidden; + display: inline; +} diff --git a/css/design.css b/css/design.css new file mode 100644 index 000000000..d6e68baa2 --- /dev/null +++ b/css/design.css @@ -0,0 +1,260 @@ +/** + * This file provides the main design styles. + * + * @author Anika Henke + * @author Andreas Gohr + */ + + +/* header +********************************************************************/ + +#dokuwiki__header { + margin: 1em 0 1.4em; +} +#dokuwiki__header .headings { + margin-bottom: .7em; +} +#dokuwiki__header h1 { + margin-bottom: .2em; + font-size: 1.5em; +} +#dokuwiki__header h1 a { + text-decoration: none; + color: #00c; + background-color: inherit; +} +#dokuwiki__header p.claim { + margin-bottom: 0; +} +#dokuwiki__header h2 { + margin-bottom: 0; + font-size: 1.125em; +} + +#dokuwiki__header .tools { + margin-bottom: .7em; +} +#dokuwiki__header .tools #dokuwiki__usertools { + position: absolute; + top: 0; + right: 0; + border-bottom: 1px solid __border__; + background-color: __background_alt__; + width: 100%; +} +#dokuwiki__header .tools #dokuwiki__usertools ul { + /* imitate #dokuwiki__site */ + margin: 0 auto; + max-width: 64em; + padding: 0 1em; +} +#dokuwiki__header .tools ul { + margin-bottom: 0; +} +#dokuwiki__header .tools ul li { + display: inline; +} +#dokuwiki__header form.search { + margin: .5em 0 .2em; + display: block; +} +form.search #qsearch__in { + width: 12em; + margin-right: .5em; +} + +#dokuwiki__header div.breadcrumbs { +} +div.breadcrumbs a { + color: __existing__; + background-color: inherit; +} + + +/* nav +********************************************************************/ + +#dokuwiki__aside h1 { } +#dokuwiki__aside h2 { } +#dokuwiki__aside h3 { } +#dokuwiki__aside h4 { } +#dokuwiki__aside h5 { } + +#dokuwiki__aside ul, +#dokuwiki__aside ol { + padding-left: 0; +} + + +/* page tools +********************************************************************/ + +#dokuwiki__pagetools { + position: fixed; + bottom: 0; + left: 0; + border-top: 1px solid __border__; + background-color: __background_alt__; + width: 100%; +} +#dokuwiki__pagetools ul { + /* imitate #dokuwiki__site */ + margin: 0 auto; + max-width: 64em; + padding: 0 1em; +} +#dokuwiki__pagetools li { + display: inline; + margin: 0 1.5em 0 0; +} + +/* content +********************************************************************/ + + /* +.dokuwiki .page { + -webkit-border-image: 1em -webkit-gradient(linear, left top, right top, from(#cccccc), to(#ffffff)); + padding: 1em; + background: -moz-linear-gradient(100% 100% 180deg, #cccccc, #ffffff 1em); + background: -webkit-gradient(linear, left top, right top, from(#cccccc), to(#ffffff)); +} + */ + +/*____________ section indenting ____________ + +.dokuwiki h1 {margin-left: 0;} +.dokuwiki h2 {margin-left: 20px;} +.dokuwiki h3 {margin-left: 40px;} +.dokuwiki h4 {margin-left: 60px;} +.dokuwiki h5 {margin-left: 80px;} +.dokuwiki div.level1 {margin-left: 0;} +.dokuwiki div.level2 {margin-left: 20px;} +.dokuwiki div.level3 {margin-left: 40px;} +.dokuwiki div.level4 {margin-left: 60px;} +.dokuwiki div.level5 {margin-left: 80px;} +*/ + + +/*____________ images ____________*/ + +/* embedded images (styles are already partly set in lib/styles/style.css) */ +.dokuwiki img.media { } +.dokuwiki img.medialeft { margin: .5em 1.5em .5em 0; } +.dokuwiki img.mediaright { margin: .5em 0 .5em 1.5em; } +.dokuwiki img.mediacenter { margin: .5em auto; } + + +/*____________ tables ____________*/ + +.dokuwiki table.inline { + min-width: 50%; +} +.dokuwiki table.inline th, +.dokuwiki table.inline td { + border: 1px solid __text_alt__; +} +.dokuwiki table.inline th { + color: inherit; + background-color: __background_neu__; +} +.dokuwiki table.inline td { +} +.dokuwiki table.inline tr:hover td { + background-color: __background_alt__; +} +.dokuwiki table.inline tr:hover th { + background-color: __border__; +} + + +/*____________ code ____________*/ + +.dokuwiki pre, +.dokuwiki tt, +.dokuwiki code, +.dokuwiki samp, +.dokuwiki kbd { + background-color: __background_alt__; + color: inherit; +} +.dokuwiki pre { + border: 1px solid __border__; +} +/* for code in */ +.dokuwiki pre.file { +} + +/* filenames for downloadable file and code blocks */ +.dokuwiki dl.code, +.dokuwiki dl.file { +} + +.dokuwiki dl.code dt, +.dokuwiki dl.file dt { + background-color: __background_alt__; + border: solid __border__; + border-width: 1px 1px 0; + color: inherit; + display: inline; + padding: 0 .5em; + margin-left: 1em; +} +.dokuwiki dl.code dt a, +.dokuwiki dl.file dt a { +} + +.dokuwiki dl.code dd, +.dokuwiki dl.file dd { + margin: 0; +} + + +/*____________ misc ____________*/ + +/* license note in footer and under edit window */ +.dokuwiki div.license { + font-size: 90%; +} + +/* any link to current page */ +.dokuwiki span.curid a { + color: __text_neu__; +} + + +/*____________ JS popup ____________*/ + +.JSpopup { + background-color: __background__; + color: __text__; + border: 1px solid __border__; + line-height: 1.2; +} + +.JSpopup ul, +.JSpopup ol { + padding-left: 0; +} + + +/* footer +********************************************************************/ + +.dokuwiki .wrapper { + margin-bottom: 2.8em; +} + +#dokuwiki__footer { + margin-bottom: 1em; +} +#dokuwiki__footer .doc { + float: left; +} +#dokuwiki__footer .top { + float: right; +} +#dokuwiki__footer .license { + clear: both; +} + diff --git a/css/includes.css b/css/includes.css new file mode 100644 index 000000000..bc189962f --- /dev/null +++ b/css/includes.css @@ -0,0 +1,4 @@ +/** + * This file provides styles for included seperate html files + * (added through "include hooks"). + */ diff --git a/css/print.css b/css/print.css new file mode 100644 index 000000000..8b1378917 --- /dev/null +++ b/css/print.css @@ -0,0 +1 @@ + diff --git a/css/rtl.css b/css/rtl.css new file mode 100644 index 000000000..d0f67dc5a --- /dev/null +++ b/css/rtl.css @@ -0,0 +1,146 @@ +/* TODO */ + +/** + * This file provides layout and design corrections for right-to-left + * languages. + * + * @author Andreas Gohr + * @author Dotan Kamber + */ + +/*..... new code ........................................................................*/ + +body, +caption, +td, +th { + text-align: right; +} + +ul, ol { + padding: 0 1.5em 0 0; +} + +li, dd { + margin: 0 1.5em 0 0; +} + +blockquote { + border-width: 0 .25em 0 0; +} + + +/*..... @todo: old code ........................................................................*/ + +.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 1.5em 0.5em 0; +} + +div.dokuwiki a.urlextern, +div.dokuwiki a.interwiki, +div.dokuwiki a.windows, +div.dokuwiki a.mail, +div.dokuwiki a.mail.JSnocheck { + /* should work but doesn't - so we just disable icons here*/ + /* + background-position: right 1px; + padding-right: 16px; + */ + background-image: none !important; + padding: 0px 0px 0px 0px; +} + +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 div.toc { + float: left; +} + +div.dokuwiki div.tocheader { + text-align: right; +} + +div.dokuwiki #toc__inside { + text-align: right; +} + +div.dokuwiki ul.toc { + padding: 0; + padding-right: 1em; +} + +div.dokuwiki ul.toc li { + background-position: right 0.6em; + padding-right:0.4em; + direction: rtl; +} + +div.dokuwiki ul.toc li.clear { + padding-right:0.4em; +} + +div.dokuwiki pre { + text-align: left; +} + diff --git a/css/structure.css b/css/structure.css new file mode 100644 index 000000000..41e446e12 --- /dev/null +++ b/css/structure.css @@ -0,0 +1,64 @@ +/** + * This file provides styles for the general layout structure. + * + * @author Anika Henke + */ + +body { + margin: 0 auto; +} +#dokuwiki__site { + margin: 0 auto; + max-width: 64em; + padding: 1.4em 1em; +} +#dokuwiki__site .site { +} + +#dokuwiki__header { +} +#dokuwiki__header .pad { +} + #dokuwiki__header .headings { + float: left; + } + #dokuwiki__header .tools { + float: right; + text-align: right; + } + +#dokuwiki__site .wrapper { + position: relative; + zoom: 1; /* @todo: IE */ +} + + /* show sidebar only in show mode */ + #dokuwiki__aside { + display: none; + } + .mode_show #dokuwiki__aside { + width: 16em; + float: left; + position: relative; + display: block; + zoom: 1; /* @todo: IE */ + } + #dokuwiki__aside .pad { + margin: 0 1.5em 0 0; + } + + /* make content wider when there's no sidebar */ + .mode_show #dokuwiki__content { + float: right; + margin-left: -16em; /* left negative margin: width of sidebar (#dokuwiki__aside) */ + width: 100%; + } + .mode_show #dokuwiki__content .pad { + margin-left: 16em; /* left positive margin: width of sidebar (#dokuwiki__aside) */ + } + +#dokuwiki__footer { + clear: both; +} +#dokuwiki__footer .pad { +} diff --git a/detail.php b/detail.php new file mode 100644 index 000000000..4dc870c5d --- /dev/null +++ b/detail.php @@ -0,0 +1,87 @@ + + * @author Anika Henke + */ + +// 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'])?>] + + + + + + + +
+ + + + +

+ +
+ + +
+

+ +
+ '.$lang['img_date'].':
'.dformat($t).'
'; + + $t = tpl_img_getTag('File.Name'); + if($t) print '
'.$lang['img_fname'].':
'.hsc($t).'
'; + + $t = tpl_img_getTag(array('Iptc.Byline','Exif.TIFFArtist','Exif.Artist','Iptc.Credit')); + if($t) print '
'.$lang['img_artist'].':
'.hsc($t).'
'; + + $t = tpl_img_getTag(array('Iptc.CopyrightNotice','Exif.TIFFCopyright','Exif.Copyright')); + if($t) print '
'.$lang['img_copyr'].':
'.hsc($t).'
'; + + $t = tpl_img_getTag('File.Format'); + if($t) print '
'.$lang['img_format'].':
'.hsc($t).'
'; + + $t = tpl_img_getTag('File.NiceSize'); + if($t) print '
'.$lang['img_fsize'].':
'.hsc($t).'
'; + + $t = tpl_img_getTag('Simple.Camera'); + if($t) print '
'.$lang['img_camera'].':
'.hsc($t).'
'; + + $t = tpl_img_getTag(array('IPTC.Keywords','IPTC.Category','xmp.dc:subject')); + if($t) print '
'.$lang['img_keywords'].':
'.hsc($t).'
'; + + ?> +
+ +
+
+
+ +

←

+ + +
+ + + + diff --git a/images/bullet.png b/images/bullet.png new file mode 100644 index 000000000..da87696c7 Binary files /dev/null and b/images/bullet.png differ diff --git a/images/closed.png b/images/closed.png new file mode 100644 index 000000000..3691ebc17 Binary files /dev/null and b/images/closed.png differ diff --git a/images/link_icon.gif b/images/link_icon.gif new file mode 100644 index 000000000..815ccb1b1 Binary files /dev/null and b/images/link_icon.gif differ diff --git a/images/mail_icon.gif b/images/mail_icon.gif new file mode 100644 index 000000000..50a87a9a0 Binary files /dev/null and b/images/mail_icon.gif differ diff --git a/images/open.png b/images/open.png new file mode 100644 index 000000000..eafb64ed3 Binary files /dev/null and b/images/open.png differ diff --git a/images/windows.gif b/images/windows.gif new file mode 100644 index 000000000..4f12acce1 Binary files /dev/null and b/images/windows.gif differ diff --git a/lang/en/lang.php b/lang/en/lang.php new file mode 100644 index 000000000..1b04113c8 --- /dev/null +++ b/lang/en/lang.php @@ -0,0 +1,7 @@ + + */ + +if (!defined('DOKU_INC')) die(); /* must be run from within DokuWiki */ +@require_once(dirname(__FILE__).'/tpl_functions.php'); /* include hook for template functions */ + +$showTools = !tpl_getConf('hideTools') || ( tpl_getConf('hideTools') && $_SERVER['REMOTE_USER'] ); +?> + + + + <?php tpl_pagetitle() ?> [<?php echo strip_tags($conf['title']) ?>] + + + + + + + + + + + are added to make it possible to e.g. style a page differently if it's in edit mode, + see http://www.dokuwiki.org/devel:action_modes for a list of action modes */ ?> + +
+ + + +
+ +
+

+ ','id="dokuwiki__top" accesskey="h" title="[H]"') */ ?> + +

+ + + + + +
+
+ +
+ + +
+

User Tools

+
    + would be: tpl_action('edit',0,'li') */ + tpl_action('admin', 1, 'li'); + tpl_action('profile', 1, 'li', 0, '', '', $INFO['userinfo']['name'].' ('.$_SERVER['REMOTE_USER'].')'); + // this partly replaces tpl_userinfo() + tpl_action('login', 1, 'li'); + ?> +
+ +
+ + + +
+

Site Tools

+ +
    + +
+
+ +
+
+ + + +
+ + +
+ + + +
+
+
+ + +
+ + +
+ +
+
+ + +
+ + +
+

Page Tools

+
    + '; + _tpl_discussion(tpl_getConf('discussionNS').':',1); + echo ''; + } + tpl_action('history', 1, 'li'); + tpl_action('backlink', 1, 'li'); + tpl_action('subscribe', 1, 'li'); + ?> +
+
+ + + + + +
+ + + +
+
+ + + +
+ +
+
+
+ + + +
+
+ + +
+ + +
+ + +
+ + + diff --git a/mediamanager.php b/mediamanager.php new file mode 100644 index 000000000..df9ff6ef6 --- /dev/null +++ b/mediamanager.php @@ -0,0 +1,46 @@ + + */ +?> + + + + + <?php echo hsc($lang['mediaselect'])?> + [<?php echo strip_tags($conf['title'])?>] + + + + + + + +
+ +
+

+ + +
+ + +
+ +
+ +
+
+ + + diff --git a/style.ini b/style.ini new file mode 100644 index 000000000..8a935c74c --- /dev/null +++ b/style.ini @@ -0,0 +1,60 @@ +; Please see http://www.php.net/manual/en/function.parse-ini-file.php +; for limitations of the ini format used here + +; 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] + +css/basic.css = screen +css/structure.css = screen +css/design.css = screen +css/_imgdetail.css = screen +css/_mediamanager.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/includes.css = screen + +;css/rtl.css = rtl +;css/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__ = "#333" +__background__ = "#fff" +; alternative text and background colors +__text_alt__ = "#999" +__background_alt__ = "#eee" +; neutral text and background colors +__text_neu__ = "#666" +__background_neu__ = "#ddd" +; border color +__border__ = "#ccc" + +;-------------------------------------------------------------------------- + +; these are used for links +__existing__ = "#090" +__missing__ = "#f30" + +; highlighting search snippets +__highlight__ = "#ff9" diff --git a/tpl_functions.php b/tpl_functions.php new file mode 100644 index 000000000..58f9ab4f9 --- /dev/null +++ b/tpl_functions.php @@ -0,0 +1,25 @@ + Date: Fri, 5 Nov 2010 10:34:56 +0000 Subject: added user page link --- conf/default.php | 1 + conf/metadata.php | 1 + lang/en/lang.php | 4 +++- lang/en/settings.php | 1 + main.php | 17 +++++++++++------ tpl_functions.php | 20 ++++++++++++++++---- 6 files changed, 33 insertions(+), 11 deletions(-) diff --git a/conf/default.php b/conf/default.php index 7f1fbb246..7c60e665e 100644 --- a/conf/default.php +++ b/conf/default.php @@ -6,5 +6,6 @@ $conf['tagline'] = 'This is the tagline - explaining what this site is about.'; $conf['discussionNS'] = 'discussion'; +$conf['userNS'] = 'user'; $conf['sidebarID'] = 'sidebar'; $conf['hideTools'] = 0; diff --git a/conf/metadata.php b/conf/metadata.php index 591053e7e..c6ebe1638 100644 --- a/conf/metadata.php +++ b/conf/metadata.php @@ -6,6 +6,7 @@ $meta['tagline'] = array('string'); $meta['discussionNS'] = array('string'); +$meta['userNS'] = array('string'); $meta['sidebarID'] = array('string'); $meta['hideTools'] = array('onoff'); diff --git a/lang/en/lang.php b/lang/en/lang.php index 1b04113c8..5496cbe86 100644 --- a/lang/en/lang.php +++ b/lang/en/lang.php @@ -4,4 +4,6 @@ * */ -$lang['btn_discussion'] = "Discussion"; +$lang['btn_discussion'] = "Discussion"; +$lang['btn_back2article'] = "Back to article"; +$lang['btn_userpage'] = "User page"; diff --git a/lang/en/settings.php b/lang/en/settings.php index 78fbbb280..66c9c4486 100644 --- a/lang/en/settings.php +++ b/lang/en/settings.php @@ -6,5 +6,6 @@ $lang['foo'] = 'Tagline'; $lang['discussionNS'] = 'Discussion namespace (leave empty to disable discussions)'; +$lang['userNS'] = 'User namespace (leave empty to disable user pages)'; $lang['sidebarID'] = 'page name of page included in sidebar'; $lang['hideTools'] = 'Hide tools when not logged in?'; diff --git a/main.php b/main.php index 338907a19..65d964cee 100644 --- a/main.php +++ b/main.php @@ -64,10 +64,15 @@ $showTools = !tpl_getConf('hideTools') || ( tpl_getConf('hideTools') && $_SERVER
    would be: tpl_action('edit',0,'li') */ - tpl_action('admin', 1, 'li'); - tpl_action('profile', 1, 'li', 0, '', '', $INFO['userinfo']['name'].' ('.$_SERVER['REMOTE_USER'].')'); - // this partly replaces tpl_userinfo() - tpl_action('login', 1, 'li'); + tpl_action('admin', 1, 'li'); + tpl_action('profile', 1, 'li', 0, '', '', $INFO['userinfo']['name'].' ('.$_SERVER['REMOTE_USER'].')'); + // this partly replaces tpl_userinfo() + if (tpl_getConf('userNS') && $_SERVER['REMOTE_USER']) { + echo '
  • '; + _tpl_userpage(tpl_getConf('userNS').':',1); + echo '
    • '; + } + tpl_action('login', 1, 'li'); ?>
@@ -80,8 +85,8 @@ $showTools = !tpl_getConf('hideTools') || ( tpl_getConf('hideTools') && $_SERVER
diff --git a/tpl_functions.php b/tpl_functions.php index 58f9ab4f9..6dc9e4bc2 100644 --- a/tpl_functions.php +++ b/tpl_functions.php @@ -4,22 +4,34 @@ if (!defined('DOKU_INC')) die(); if (!defined('DOKU_LF')) define('DOKU_LF',"\n"); +/* @todo: fix label of buttons */ + /** * Create link/button to discussion page and back */ function _tpl_discussion($discussNS='discussion:',$link=0) { global $ID; - global $lang; if(substr($ID,0,strlen($discussNS))==$discussNS) { $backID = substr(strstr($ID,':'),1); if ($link) - tpl_pagelink(':'.$backID,$lang['btn_back']); + tpl_link(wl($backID),tpl_getLang('btn_back2article')); else - echo html_btn('back',$backID,'',array()); + echo html_btn('back2article',$backID,'',array()); } else { if ($link) - tpl_pagelink($discussNS.$ID,tpl_getLang('btn_discussion')); + tpl_link(wl($discussNS.$ID),tpl_getLang('btn_discussion')); else echo html_btn('discussion',$discussNS.$ID,'',array()); } } + +/** + * Create link/button to user page + */ +function _tpl_userpage($userNS='user:',$link=0) { + global $conf; + if ($link) + tpl_link(wl($userNS.$_SERVER['REMOTE_USER'].':'.$conf['start']),tpl_getLang('btn_userpage')); + else + echo html_btn('userpage',$userNS.$_SERVER['REMOTE_USER'].':'.$conf['start'],'',array()); +} -- cgit v1.2.3 From 23bca4f3845d2ee190cdcbd04ecb5452c1fc502f Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Sat, 6 Nov 2010 23:11:25 +0000 Subject: finished design, improved template functions --- conf/default.php | 11 ++-- conf/metadata.php | 13 ++--- css/_links.css | 7 ++- css/_mediamanager.css | 8 +-- css/_toc.css | 4 +- css/design.css | 149 +++++++++++++++++++++++++++++++++----------------- detail.php | 8 +-- lang/en/lang.php | 12 +++- lang/en/settings.php | 11 ++-- main.php | 75 ++++++++++++------------- mediamanager.php | 12 +--- tpl_functions.php | 55 ++++++++++++++----- 12 files changed, 219 insertions(+), 146 deletions(-) diff --git a/conf/default.php b/conf/default.php index 7c60e665e..e5bce5e9d 100644 --- a/conf/default.php +++ b/conf/default.php @@ -4,8 +4,9 @@ * */ -$conf['tagline'] = 'This is the tagline - explaining what this site is about.'; -$conf['discussionNS'] = 'discussion'; -$conf['userNS'] = 'user'; -$conf['sidebarID'] = 'sidebar'; -$conf['hideTools'] = 0; +$conf['tagline'] = 'This is the tagline - explaining what this site is about.'; +$conf['discussionNS'] = 'discussion'; +$conf['discussNSreverse'] = 0; +$conf['userNS'] = 'user'; +$conf['sidebarID'] = 'sidebar'; +$conf['hideTools'] = 0; diff --git a/conf/metadata.php b/conf/metadata.php index c6ebe1638..792c47ae2 100644 --- a/conf/metadata.php +++ b/conf/metadata.php @@ -4,10 +4,9 @@ * */ -$meta['tagline'] = array('string'); -$meta['discussionNS'] = array('string'); -$meta['userNS'] = array('string'); -$meta['sidebarID'] = array('string'); -$meta['hideTools'] = array('onoff'); - -// array('multichoice','_choices' => array(0,1,2)); +$meta['tagline'] = array('string'); +$meta['discussionNS'] = array('string'); +$meta['discussNSreverse'] = array('onoff'); +$meta['userNS'] = array('string'); +$meta['sidebarID'] = array('string'); +$meta['hideTools'] = array('onoff'); diff --git a/css/_links.css b/css/_links.css index 8fc6c1322..d62a4dede 100644 --- a/css/_links.css +++ b/css/_links.css @@ -13,7 +13,7 @@ .dokuwiki a.wikilink2 { color: __missing__; background-color: inherit; - text-decoration: none !important; + text-decoration: none; } .dokuwiki a.wikilink2:link, .dokuwiki a.wikilink2:visited { @@ -25,6 +25,11 @@ border-bottom-width: 0; } +/* any link to current page */ +.dokuwiki span.curid a { + font-weight: bold; +} + /*____________ other link types ____________*/ .dokuwiki a.urlextern, diff --git a/css/_mediamanager.css b/css/_mediamanager.css index da1af909e..01e23efd0 100644 --- a/css/_mediamanager.css +++ b/css/_mediamanager.css @@ -14,7 +14,7 @@ html.popup { overflow: hidden; } -#media__left { +#mediamgr__aside { width: 30%; height: 100%; overflow: auto; @@ -22,18 +22,18 @@ html.popup { left: 0; border-right: solid 1px __border__; } -#media__left .pad { +#mediamgr__aside .pad { padding: .5em; } -#media__right { +#mediamgr__content { width: 69.7%; height: 100%; overflow: auto; position: absolute; right: 0; } -#media__right .pad { +#mediamgr__content .pad { padding: .5em; } diff --git a/css/_toc.css b/css/_toc.css index 5595c521b..fcccf4fc1 100644 --- a/css/_toc.css +++ b/css/_toc.css @@ -16,7 +16,7 @@ /*____________ toc header ____________*/ .dokuwiki div.tocheader { - padding: 0.2em 0.4em; + padding: .2em .5em; margin-bottom: .2em; font-weight: bold; background-color: __background_alt__; @@ -47,7 +47,7 @@ /*____________ toc list ____________*/ .dokuwiki #toc__inside { - padding: .2em .4em; + padding: .2em .5em; background-color: __background_alt__; color: __text__; } diff --git a/css/design.css b/css/design.css index d6e68baa2..a86fc9f27 100644 --- a/css/design.css +++ b/css/design.css @@ -10,13 +10,14 @@ ********************************************************************/ #dokuwiki__header { - margin: 1em 0 1.4em; + margin: 1em 0 0; } + #dokuwiki__header .headings { - margin-bottom: .7em; + margin-bottom: 2.1em; } #dokuwiki__header h1 { - margin-bottom: .2em; + margin-bottom: 0; font-size: 1.5em; } #dokuwiki__header h1 a { @@ -33,21 +34,7 @@ } #dokuwiki__header .tools { - margin-bottom: .7em; -} -#dokuwiki__header .tools #dokuwiki__usertools { - position: absolute; - top: 0; - right: 0; - border-bottom: 1px solid __border__; - background-color: __background_alt__; - width: 100%; -} -#dokuwiki__header .tools #dokuwiki__usertools ul { - /* imitate #dokuwiki__site */ - margin: 0 auto; - max-width: 64em; - padding: 0 1em; + margin-bottom: 2.1em; } #dokuwiki__header .tools ul { margin-bottom: 0; @@ -55,71 +42,132 @@ #dokuwiki__header .tools ul li { display: inline; } + #dokuwiki__header form.search { - margin: .5em 0 .2em; + margin: .5em 0 0; display: block; } -form.search #qsearch__in { +#dokuwiki__header form.search #qsearch__in { width: 12em; margin-right: .5em; } #dokuwiki__header div.breadcrumbs { + margin-bottom: .3em; } -div.breadcrumbs a { +#dokuwiki__header div.breadcrumbs a { color: __existing__; background-color: inherit; } -/* nav +/* tools ********************************************************************/ -#dokuwiki__aside h1 { } -#dokuwiki__aside h2 { } -#dokuwiki__aside h3 { } -#dokuwiki__aside h4 { } -#dokuwiki__aside h5 { } - -#dokuwiki__aside ul, -#dokuwiki__aside ol { - padding-left: 0; +/* make wiki links look the same as tool links in tool bars */ +#dokuwiki__usertools a.wikilink1, +#dokuwiki__pagetools a.wikilink1, +#dokuwiki__usertools a.wikilink2, +#dokuwiki__pagetools a.wikilink2 { + color: #00c; + border-bottom-width: 0; +} +#dokuwiki__usertools a.wikilink2:hover, +#dokuwiki__pagetools a.wikilink2:hover, +#dokuwiki__usertools a.wikilink2:active, +#dokuwiki__pagetools a.wikilink2:active, +#dokuwiki__usertools a.wikilink2:focus, +#dokuwiki__pagetools a.wikilink2:focus { + text-decoration: underline; } +/* highlight selected tool */ +.mode_admin a.action.admin, +.mode_profile a.action.profile, +.mode_recent a.action.recent, +.mode_index a.action.index, +.mode_revisions a.action.revs, +.mode_backlink a.action.backlink { + font-weight: bold; +} -/* page tools -********************************************************************/ +/*____________ user tools ____________*/ -#dokuwiki__pagetools { - position: fixed; - bottom: 0; - left: 0; - border-top: 1px solid __border__; +#dokuwiki__usertools { + position: absolute; + top: 0; + right: 0; + border-bottom: 1px solid __border__; background-color: __background_alt__; width: 100%; } +#dokuwiki__usertools ul, #dokuwiki__pagetools ul { /* imitate #dokuwiki__site */ margin: 0 auto; max-width: 64em; padding: 0 1em; } -#dokuwiki__pagetools li { +#dokuwiki__usertools ul li.user { + float: left; + margin-left: 0; +} + +/*____________ page tools ____________*/ + +#dokuwiki__pagetools { + position: fixed; + bottom: 0; + left: 0; + border-top: 1px solid __border__; + background-color: __background_alt__; + width: 100%; + z-index: 10; +} +#dokuwiki__pagetools ul li { display: inline; margin: 0 1.5em 0 0; } +#dokuwiki__pagetools ul li a.action.top { + float: right; +} + + +/* sidebar +********************************************************************/ + +#dokuwiki__aside { + padding-top: .4em; + line-height: 1.2; +} + +/* make sidebar more condensed */ + +#dokuwiki__aside h1 { margin-bottom: .222em; } +#dokuwiki__aside h2 { margin-bottom: .333em; } +#dokuwiki__aside h3 { margin-bottom: .444em; } +#dokuwiki__aside h4 { margin-bottom: .5em; } +#dokuwiki__aside h5 { margin-bottom: .5714em; } + +#dokuwiki__aside p, #dokuwiki__aside ul, #dokuwiki__aside ol, #dokuwiki__aside dl, +#dokuwiki__aside pre, #dokuwiki__aside table, #dokuwiki__aside fieldset, +#dokuwiki__aside hr, #dokuwiki__aside blockquote, #dokuwiki__aside address { + margin-bottom: .7em; +} + +#dokuwiki__aside ul, #dokuwiki__aside ol { + padding-left: 0; +} +#dokuwiki__aside li ul, #dokuwiki__aside li ol { + margin-bottom: 0; +} + /* content ********************************************************************/ - /* .dokuwiki .page { - -webkit-border-image: 1em -webkit-gradient(linear, left top, right top, from(#cccccc), to(#ffffff)); - padding: 1em; - background: -moz-linear-gradient(100% 100% 180deg, #cccccc, #ffffff 1em); - background: -webkit-gradient(linear, left top, right top, from(#cccccc), to(#ffffff)); } - */ /*____________ section indenting ____________ @@ -180,6 +228,7 @@ div.breadcrumbs a { } .dokuwiki pre { border: 1px solid __border__; + padding: 0 .2em; } /* for code in */ .dokuwiki pre.file { @@ -217,11 +266,6 @@ div.breadcrumbs a { font-size: 90%; } -/* any link to current page */ -.dokuwiki span.curid a { - color: __text_neu__; -} - /*____________ JS popup ____________*/ @@ -230,6 +274,7 @@ div.breadcrumbs a { color: __text__; border: 1px solid __border__; line-height: 1.2; + padding: 0 .2em; } .JSpopup ul, @@ -257,4 +302,8 @@ div.breadcrumbs a { #dokuwiki__footer .license { clear: both; } +#dokuwiki__footer .license img { + margin: 0 .5em 0 0; + float: none; +} diff --git a/detail.php b/detail.php index 4dc870c5d..500890114 100644 --- a/detail.php +++ b/detail.php @@ -1,13 +1,7 @@ * @author Anika Henke */ diff --git a/lang/en/lang.php b/lang/en/lang.php index 5496cbe86..91b04b177 100644 --- a/lang/en/lang.php +++ b/lang/en/lang.php @@ -4,6 +4,12 @@ * */ -$lang['btn_discussion'] = "Discussion"; -$lang['btn_back2article'] = "Back to article"; -$lang['btn_userpage'] = "User page"; +$lang['discussion'] = 'Discussion'; +$lang['back_to_article'] = 'Back to article'; +$lang['userpage'] = 'User page'; + +/* accessibility headlines */ +$lang['user_tools'] = 'User Tools'; +$lang['site_tools'] = 'Site Tools'; +$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 66c9c4486..e2fde20c4 100644 --- a/lang/en/settings.php +++ b/lang/en/settings.php @@ -4,8 +4,9 @@ * */ -$lang['foo'] = 'Tagline'; -$lang['discussionNS'] = 'Discussion namespace (leave empty to disable discussions)'; -$lang['userNS'] = 'User namespace (leave empty to disable user pages)'; -$lang['sidebarID'] = 'page name of page included in sidebar'; -$lang['hideTools'] = 'Hide tools when not logged in?'; +$lang['tagline'] = 'Tagline'; +$lang['discussionNS'] = 'Discussion namespace (leave empty to disable discussions)'; +$lang['discussNSreverse'] = 'Reverse discussion namespace? (e.g. "foo:bar:discussion" instead of "discussion:foo:bar")'; +$lang['userNS'] = 'User namespace (leave empty to disable user pages)'; +$lang['sidebarID'] = 'page name of page included in sidebar'; +$lang['hideTools'] = 'Hide tools when not logged in?'; diff --git a/main.php b/main.php index 65d964cee..23f3f2d24 100644 --- a/main.php +++ b/main.php @@ -45,44 +45,41 @@ $showTools = !tpl_getConf('hideTools') || ( tpl_getConf('hideTools') && $_SERVER

- -
- +
-

User Tools

+

    would be: tpl_action('edit',0,'li') */ - tpl_action('admin', 1, 'li'); - tpl_action('profile', 1, 'li', 0, '', '', $INFO['userinfo']['name'].' ('.$_SERVER['REMOTE_USER'].')'); - // this partly replaces tpl_userinfo() - if (tpl_getConf('userNS') && $_SERVER['REMOTE_USER']) { - echo '
  • '; - _tpl_userpage(tpl_getConf('userNS').':',1); + if ($_SERVER['REMOTE_USER']) { + echo '
  • '; + tpl_userinfo(); /* 'Logged in as ...' */ echo '
    • '; } + tpl_action('admin', 1, 'li'); + if (tpl_getConf('userNS')) { + _tpl_userpage(tpl_getConf('userNS'),1,'li'); + } + tpl_action('profile', 1, 'li'); tpl_action('login', 1, 'li'); ?>
-
- +
-

Site Tools

- +

+
    - - -
    -

    Page Tools

    -
      - '; - _tpl_discussion(tpl_getConf('discussionNS').':',1); - echo ''; - } - tpl_action('history', 1, 'li'); - tpl_action('backlink', 1, 'li'); - tpl_action('subscribe', 1, 'li'); - ?> -
    -
    - - @@ -154,20 +131,38 @@ $showTools = !tpl_getConf('hideTools') || ( tpl_getConf('hideTools') && $_SERVER
    -
    + + +
    +

    +
      + +
    +
    + +
    -
- +
diff --git a/mediamanager.php b/mediamanager.php index df9ff6ef6..0f4362577 100644 --- a/mediamanager.php +++ b/mediamanager.php @@ -1,13 +1,7 @@ */ ?>
-
+

@@ -37,7 +31,7 @@
-
+
diff --git a/tpl_functions.php b/tpl_functions.php index 6dc9e4bc2..0dfee9595 100644 --- a/tpl_functions.php +++ b/tpl_functions.php @@ -1,37 +1,66 @@ */ -function _tpl_discussion($discussNS='discussion:',$link=0) { +function _tpl_discussion($discussNS='discussion',$link=0,$wrapper=0,$reverse=0) { global $ID; - if(substr($ID,0,strlen($discussNS))==$discussNS) { - $backID = substr(strstr($ID,':'),1); + + if ($reverse) { + $discussPage = $ID.':'.$discussNS; + $isDiscussPage = substr($ID,-strlen($discussNS),strlen($discussNS))==$discussNS; + $backID = substr($ID,0,-strlen($discussNS)); + } else { + $discussPage = $discussNS.':'.$ID; + $isDiscussPage = substr($ID,0,strlen($discussNS))==$discussNS; + $backID = strstr($ID,':'); + } + + if ($wrapper) echo "<$wrapper>"; + + if($isDiscussPage) { if ($link) - tpl_link(wl($backID),tpl_getLang('btn_back2article')); + tpl_pagelink($backID,tpl_getLang('back_to_article')); else - echo html_btn('back2article',$backID,'',array()); + echo html_btn('back2article',$backID,'',array(),0,0,tpl_getLang('back_to_article')); } else { if ($link) - tpl_link(wl($discussNS.$ID),tpl_getLang('btn_discussion')); + tpl_pagelink($discussPage,tpl_getLang('discussion')); else - echo html_btn('discussion',$discussNS.$ID,'',array()); + echo html_btn('discussion',$discussPage,'',array(),0,0,tpl_getLang('discussion')); } + + if ($wrapper) echo ""; } /** * Create link/button to user page + * + * @author Anika Henke */ -function _tpl_userpage($userNS='user:',$link=0) { +function _tpl_userpage($userNS='user',$link=0,$wrapper=false) { + if (!$_SERVER['REMOTE_USER']) return; + global $conf; + $userPage = $userNS.':'.$_SERVER['REMOTE_USER'].':'.$conf['start']; + + if ($wrapper) echo "<$wrapper>"; + if ($link) - tpl_link(wl($userNS.$_SERVER['REMOTE_USER'].':'.$conf['start']),tpl_getLang('btn_userpage')); + tpl_pagelink($userPage,tpl_getLang('userpage')); else - echo html_btn('userpage',$userNS.$_SERVER['REMOTE_USER'].':'.$conf['start'],'',array()); + echo html_btn('userpage',$userPage,'',array(),0,0,tpl_getLang('userpage')); + + if ($wrapper) echo ""; } -- cgit v1.2.3 From a52b1359cd07ffbe5e34429a5cd310e1f38e8b43 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Sun, 7 Nov 2010 12:20:30 +0000 Subject: IE fixes --- css/_edit.css | 4 +++- css/design.css | 27 +++++++++++++++++++++++++++ css/structure.css | 12 ++++++++++-- 3 files changed, 40 insertions(+), 3 deletions(-) diff --git a/css/_edit.css b/css/_edit.css index db62dc976..a17df77f7 100644 --- a/css/_edit.css +++ b/css/_edit.css @@ -41,7 +41,9 @@ div.picker button.pickerbutton { .dokuwiki textarea.edit { /* should just be "width: 100%", but IE8 doesn't like it, see FS#1910 + FS#1667 */ - width: 100%; + width: 700px; + min-width: 100%; + max-width: 100%; margin-bottom: .5em; } diff --git a/css/design.css b/css/design.css index a86fc9f27..243733462 100644 --- a/css/design.css +++ b/css/design.css @@ -12,6 +12,9 @@ #dokuwiki__header { margin: 1em 0 0; } +#IE7 #dokuwiki__header { + margin-top: 2em; +} #dokuwiki__header .headings { margin-bottom: 2.1em; @@ -108,6 +111,9 @@ max-width: 64em; padding: 0 1em; } +#IE6 #dokuwiki__usertools ul { + width: 100%; +} #dokuwiki__usertools ul li.user { float: left; margin-left: 0; @@ -124,6 +130,9 @@ width: 100%; z-index: 10; } +#IE6 #dokuwiki__content { + margin-bottom: 1.4em; +} #dokuwiki__pagetools ul li { display: inline; margin: 0 1.5em 0 0; @@ -131,6 +140,14 @@ #dokuwiki__pagetools ul li a.action.top { float: right; } +#IE7 #dokuwiki__pagetools ul { + position: relative;; +} +#IE7 #dokuwiki__pagetools ul li a.action.top { + position: absolute; + top: 0; + right: 0; +} /* sidebar @@ -266,6 +283,10 @@ font-size: 90%; } +#IE6 input.button, #IE6 button, +#IE7 input.button, #IE7 button { + line-height: 1.4; +} /*____________ JS popup ____________*/ @@ -289,10 +310,16 @@ .dokuwiki .wrapper { margin-bottom: 2.8em; } +#IE6 .dokuwiki .wrapper { + margin-bottom: 1.4em; +} #dokuwiki__footer { margin-bottom: 1em; } +#IE7 #dokuwiki__footer { + height: 1%; +} #dokuwiki__footer .doc { float: left; } diff --git a/css/structure.css b/css/structure.css index 41e446e12..7b188dbd6 100644 --- a/css/structure.css +++ b/css/structure.css @@ -22,14 +22,23 @@ body { #dokuwiki__header .headings { float: left; } + #IE6 #dokuwiki__header .headings { + width: 50%; + } #dokuwiki__header .tools { float: right; text-align: right; } + #IE6 #dokuwiki__header .tools { + width: 50%; + } #dokuwiki__site .wrapper { position: relative; - zoom: 1; /* @todo: IE */ +} +#IE6 #dokuwiki__site .wrapper, +#IE7 #dokuwiki__site .wrapper { + height: 1%; } /* show sidebar only in show mode */ @@ -41,7 +50,6 @@ body { float: left; position: relative; display: block; - zoom: 1; /* @todo: IE */ } #dokuwiki__aside .pad { margin: 0 1.5em 0 0; -- cgit v1.2.3 From 8fdcbb446b412f81b3336cfe9af73efe561a6633 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Sun, 7 Nov 2010 13:14:03 +0000 Subject: more IE fixes --- css/design.css | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/css/design.css b/css/design.css index 243733462..384aaa7b8 100644 --- a/css/design.css +++ b/css/design.css @@ -140,9 +140,11 @@ #dokuwiki__pagetools ul li a.action.top { float: right; } +#IE6 #dokuwiki__pagetools ul, #IE7 #dokuwiki__pagetools ul { - position: relative;; + position: relative; } +#IE6 #dokuwiki__pagetools ul li a.action.top, #IE7 #dokuwiki__pagetools ul li a.action.top { position: absolute; top: 0; @@ -283,8 +285,8 @@ font-size: 90%; } -#IE6 input.button, #IE6 button, -#IE7 input.button, #IE7 button { +#IE6 .dokuwiki input.button, #IE6 .dokuwiki button, +#IE7 .dokuwiki input.button, #IE7 .dokuwiki button { line-height: 1.4; } @@ -317,6 +319,7 @@ #dokuwiki__footer { margin-bottom: 1em; } +#IE6 #dokuwiki__footer, #IE7 #dokuwiki__footer { height: 1%; } -- cgit v1.2.3 From a21fd4b9fa168f867852150b109fcd7da2e59996 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Sun, 7 Nov 2010 13:15:33 +0000 Subject: made favicon.ico more flexible (use from data/media only if it exists, otherwise from tpl) --- images/favicon.ico | Bin 0 -> 7406 bytes main.php | 2 +- tpl_functions.php | 14 ++++++++++++++ 3 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 images/favicon.ico diff --git a/images/favicon.ico b/images/favicon.ico new file mode 100644 index 000000000..8b9616abb Binary files /dev/null and b/images/favicon.ico differ diff --git a/main.php b/main.php index 23f3f2d24..0150d37cc 100644 --- a/main.php +++ b/main.php @@ -18,7 +18,7 @@ $showTools = !tpl_getConf('hideTools') || ( tpl_getConf('hideTools') && $_SERVER <?php tpl_pagetitle() ?> [<?php echo strip_tags($conf['title']) ?>] - + diff --git a/tpl_functions.php b/tpl_functions.php index 0dfee9595..d258ed38b 100644 --- a/tpl_functions.php +++ b/tpl_functions.php @@ -4,6 +4,8 @@ * * This file provides template specific custom functions that are * not provided by the DokuWiki core. + * It is common practice to start each function with an underscore + * to make sure it won't interfere with future core functions. */ // must be run from within DokuWiki @@ -64,3 +66,15 @@ function _tpl_userpage($userNS='user',$link=0,$wrapper=false) { if ($wrapper) echo ""; } + +/** + * Use favicon.ico from data/media root directory if it exists, otherwise use + * the one in the template's image directory. + * + * @author Anika Henke + */ +function _tpl_getFavicon() { + if (file_exists(mediaFN('favicon.ico'))) + return ml('favicon.ico'); + return DOKU_TPL.'images/favicon.ico'; +} -- cgit v1.2.3 From 2fc923cadb76d6400175c5a87f077a2730e9e1b4 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Sun, 7 Nov 2010 14:17:51 +0000 Subject: split design.css up into design.css and content.css --- css/content.css | 125 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ css/design.css | 93 +---------------------------------------- style.ini | 1 + 3 files changed, 128 insertions(+), 91 deletions(-) create mode 100644 css/content.css diff --git a/css/content.css b/css/content.css new file mode 100644 index 000000000..2426b51e8 --- /dev/null +++ b/css/content.css @@ -0,0 +1,125 @@ +/** + * This file provides the main design styles for the page content. + * + * @author Anika Henke + * @author Andreas Gohr + */ + + +/*____________ section indenting ____________ + +.dokuwiki h1 {margin-left: 0;} +.dokuwiki h2 {margin-left: .666em;} +.dokuwiki h3 {margin-left: 1.776em;} +.dokuwiki h4 {margin-left: 3em;} +.dokuwiki h5 {margin-left: 4.5712em;} +.dokuwiki div.level1 {margin-left: 0;} +.dokuwiki div.level2 {margin-left: 1em;} +.dokuwiki div.level3 {margin-left: 2em;} +.dokuwiki div.level4 {margin-left: 3em;} +.dokuwiki div.level5 {margin-left: 4em;} +*/ +/* hx margin-left = (1 / font-size) * .levelx-margin */ + + +/*____________ images ____________*/ + +/* embedded images (styles are already partly set in lib/styles/style.css) */ +.dokuwiki img.media { } +.dokuwiki img.medialeft { margin: .5em 1.5em .5em 0; } +.dokuwiki img.mediaright { margin: .5em 0 .5em 1.5em; } +.dokuwiki img.mediacenter { margin: .5em auto; } + + +/*____________ tables ____________*/ + +.dokuwiki table.inline { + min-width: 50%; +} +.dokuwiki table.inline th, +.dokuwiki table.inline td { + border: 1px solid __text_alt__; +} +.dokuwiki table.inline th { + color: inherit; + background-color: __background_neu__; +} +.dokuwiki table.inline td { +} +.dokuwiki table.inline tr:hover td { + background-color: __background_alt__; +} +.dokuwiki table.inline tr:hover th { + background-color: __border__; +} + + +/*____________ code ____________*/ + +.dokuwiki pre, +.dokuwiki tt, +.dokuwiki code, +.dokuwiki samp, +.dokuwiki kbd { + background-color: __background_alt__; + color: inherit; +} +.dokuwiki pre { + border: 1px solid __border__; + padding: 0 .2em; +} +/* for code in */ +.dokuwiki pre.file { +} + +/* filenames for downloadable file and code blocks */ +.dokuwiki dl.code, +.dokuwiki dl.file { +} + +.dokuwiki dl.code dt, +.dokuwiki dl.file dt { + background-color: __background_alt__; + border: solid __border__; + border-width: 1px 1px 0; + color: inherit; + display: inline; + padding: 0 .5em; + margin-left: 1em; +} +.dokuwiki dl.code dt a, +.dokuwiki dl.file dt a { +} + +.dokuwiki dl.code dd, +.dokuwiki dl.file dd { + margin: 0; +} + + +/*____________ misc ____________*/ + +/* license note in footer and under edit window */ +.dokuwiki div.license { + font-size: 90%; +} + +#IE6 .dokuwiki input.button, #IE6 .dokuwiki button, +#IE7 .dokuwiki input.button, #IE7 .dokuwiki button { + line-height: 1.4; +} + +/*____________ JS popup ____________*/ + +.JSpopup { + background-color: __background__; + color: __text__; + border: 1px solid __border__; + line-height: 1.2; + padding: 0 .2em; +} + +.JSpopup ul, +.JSpopup ol { + padding-left: 0; +} diff --git a/css/design.css b/css/design.css index 384aaa7b8..945ebd722 100644 --- a/css/design.css +++ b/css/design.css @@ -1,5 +1,6 @@ /** - * This file provides the main design styles. + * This file provides the main design styles for the + * bits that surround the content. * * @author Anika Henke * @author Andreas Gohr @@ -188,96 +189,6 @@ .dokuwiki .page { } -/*____________ section indenting ____________ - -.dokuwiki h1 {margin-left: 0;} -.dokuwiki h2 {margin-left: 20px;} -.dokuwiki h3 {margin-left: 40px;} -.dokuwiki h4 {margin-left: 60px;} -.dokuwiki h5 {margin-left: 80px;} -.dokuwiki div.level1 {margin-left: 0;} -.dokuwiki div.level2 {margin-left: 20px;} -.dokuwiki div.level3 {margin-left: 40px;} -.dokuwiki div.level4 {margin-left: 60px;} -.dokuwiki div.level5 {margin-left: 80px;} -*/ - - -/*____________ images ____________*/ - -/* embedded images (styles are already partly set in lib/styles/style.css) */ -.dokuwiki img.media { } -.dokuwiki img.medialeft { margin: .5em 1.5em .5em 0; } -.dokuwiki img.mediaright { margin: .5em 0 .5em 1.5em; } -.dokuwiki img.mediacenter { margin: .5em auto; } - - -/*____________ tables ____________*/ - -.dokuwiki table.inline { - min-width: 50%; -} -.dokuwiki table.inline th, -.dokuwiki table.inline td { - border: 1px solid __text_alt__; -} -.dokuwiki table.inline th { - color: inherit; - background-color: __background_neu__; -} -.dokuwiki table.inline td { -} -.dokuwiki table.inline tr:hover td { - background-color: __background_alt__; -} -.dokuwiki table.inline tr:hover th { - background-color: __border__; -} - - -/*____________ code ____________*/ - -.dokuwiki pre, -.dokuwiki tt, -.dokuwiki code, -.dokuwiki samp, -.dokuwiki kbd { - background-color: __background_alt__; - color: inherit; -} -.dokuwiki pre { - border: 1px solid __border__; - padding: 0 .2em; -} -/* for code in */ -.dokuwiki pre.file { -} - -/* filenames for downloadable file and code blocks */ -.dokuwiki dl.code, -.dokuwiki dl.file { -} - -.dokuwiki dl.code dt, -.dokuwiki dl.file dt { - background-color: __background_alt__; - border: solid __border__; - border-width: 1px 1px 0; - color: inherit; - display: inline; - padding: 0 .5em; - margin-left: 1em; -} -.dokuwiki dl.code dt a, -.dokuwiki dl.file dt a { -} - -.dokuwiki dl.code dd, -.dokuwiki dl.file dd { - margin: 0; -} - - /*____________ misc ____________*/ /* license note in footer and under edit window */ diff --git a/style.ini b/style.ini index 8a935c74c..9a16508e1 100644 --- a/style.ini +++ b/style.ini @@ -11,6 +11,7 @@ css/basic.css = screen css/structure.css = screen css/design.css = screen +css/content.css = screen css/_imgdetail.css = screen css/_mediamanager.css = screen css/_links.css = screen -- cgit v1.2.3 From 0adc52038c89b5a01beeef44630df615c526791f Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Sun, 7 Nov 2010 16:43:13 +0000 Subject: added RTL styles --- css/_admin.css | 2 +- css/_links.css | 9 +- css/_mediamanager.css | 5 +- css/_recent.css | 7 +- css/rtl.css | 310 +++++++++++++++++++++++++++++++++++++------------- style.ini | 4 +- 6 files changed, 244 insertions(+), 93 deletions(-) diff --git a/css/_admin.css b/css/_admin.css index c5d188763..e4664367c 100644 --- a/css/_admin.css +++ b/css/_admin.css @@ -7,7 +7,7 @@ float: left; width: 40%; list-style-type: none; - font-size: 115%; + font-size: 1.125em; } .dokuwiki ul.admin_tasks li { diff --git a/css/_links.css b/css/_links.css index d62a4dede..7e7f18268 100644 --- a/css/_links.css +++ b/css/_links.css @@ -34,10 +34,12 @@ .dokuwiki a.urlextern, .dokuwiki a.windows, -.dokuwiki a.mail { +.dokuwiki a.mail, +.dokuwiki a.mediafile, +.dokuwiki a.interwiki { background-repeat: no-repeat; background-position: 0 center; - padding-left: 17px; + padding: 0 0 0 17px; } /* external link */ .dokuwiki a.urlextern { @@ -55,10 +57,7 @@ /* icons of the following are set by dokuwiki in lib/exe/css.php */ /* link to some embedded media */ .dokuwiki a.mediafile { - background-position: 0 center; - padding-bottom: 0; } /* interwiki link */ .dokuwiki a.interwiki { - background-position: 0 center; } diff --git a/css/_mediamanager.css b/css/_mediamanager.css index 01e23efd0..d47e581ff 100644 --- a/css/_mediamanager.css +++ b/css/_mediamanager.css @@ -20,7 +20,7 @@ html.popup { overflow: auto; position: absolute; left: 0; - border-right: solid 1px __border__; + border-right: 1px solid __border__; } #mediamgr__aside .pad { padding: .5em; @@ -208,6 +208,9 @@ form#dw__mediasearch input.button { margin: 0; } #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 { diff --git a/css/_recent.css b/css/_recent.css index 75d3a2da8..9e35c1270 100644 --- a/css/_recent.css +++ b/css/_recent.css @@ -51,11 +51,8 @@ text-align: center; margin: 1.4em 0; } -.dokuwiki div.pagenav-prev { - display: inline; - margin-right: .5em; -} +.dokuwiki div.pagenav-prev, .dokuwiki div.pagenav-next { display: inline; - margin-left: .5em; + margin: 0 .5em; } diff --git a/css/rtl.css b/css/rtl.css index d0f67dc5a..e15b958f8 100644 --- a/css/rtl.css +++ b/css/rtl.css @@ -1,14 +1,11 @@ -/* TODO */ - /** * This file provides layout and design corrections for right-to-left * languages. * - * @author Andreas Gohr - * @author Dotan Kamber + * @author Anika Henke */ -/*..... new code ........................................................................*/ +/*____________ basic ____________*/ body, caption, @@ -20,127 +17,282 @@ th { ul, ol { padding: 0 1.5em 0 0; } - li, dd { margin: 0 1.5em 0 0; } - blockquote { border-width: 0 .25em 0 0; } +h1, h2, h3, h4, h5, h6, +caption, legend { + clear: right; +} + + +/*____________ structure ____________*/ + +#dokuwiki__header .headings { + float: right; +} +#dokuwiki__header .tools { + float: left; + text-align: left; +} -/*..... @todo: old code ........................................................................*/ +.mode_show #dokuwiki__aside { + float: right; +} +#dokuwiki__aside .pad { + margin: 0 0 0 1.5em; +} + +.mode_show #dokuwiki__content { + float: left; + margin-left: 0; + margin-right: -16em; +} +.mode_show #dokuwiki__content .pad { + margin-left: 0; + margin-right: 16em; +} + +/*____________ design ____________*/ + +#dokuwiki__header form.search #qsearch__in { + margin-right: 0; + margin-left: .5em; +} -.bar-left { - float: right; - text-align: right; +#dokuwiki__aside ul, #dokuwiki__aside ol { + padding-right: 0; } -.bar-right { - float: left; - text-align: left; +/*____________ content ____________*/ + +/* section indenting +.dokuwiki h1 {margin-left: 0; margin-right: 0;} +.dokuwiki h2 {margin-left: 0; margin-right: .666em;} +.dokuwiki h3 {margin-left: 0; margin-right: 1.776em;} +.dokuwiki h4 {margin-left: 0; margin-right: 3em;} +.dokuwiki h5 {margin-left: 0; margin-right: 4.5712em;} +.dokuwiki div.level1 {margin-left: 0; margin-right: 0;} +.dokuwiki div.level2 {margin-left: 0; margin-right: 1em;} +.dokuwiki div.level3 {margin-left: 0; margin-right: 2em;} +.dokuwiki div.level4 {margin-left: 0; margin-right: 3em;} +.dokuwiki div.level5 {margin-left: 0; margin-right: 4em;} +*/ + +.dokuwiki dl.code dt, +.dokuwiki dl.file dt { + margin-left: 0; + margin-right: 1em; } -.pagename { - float: right; - text-align: right; +.JSpopup ul, +.JSpopup ol { + padding-right: 0; } -.logo { - float: left; - text-align: left; + +/*____________ _imgdetail ____________*/ + +#dokuwiki__detail div.content img { + float: right; + margin-right: 0; + margin-left: 1.5em; +} +#dokuwiki__detail div.content div.img_detail { + float: right } -label { - text-align: left; + +/*____________ _mediamanager ____________*/ + +#mediamgr__aside { + left: auto; + right: 0; + border-right-width: 0; + border-left: 1px solid __border__; +} +#mediamgr__content { + right: auto; + left: 0; } -label.simple { - text-align: right; +#media__opts input { + margin-right: 0; + margin-left: .3em; } -div.meta div.user { - float: right +#media__tree ul { + padding-left: 0; + padding-right: .2em; +} +#media__tree ul li { + clear: right; + margin-right: 0; +} +#media__tree ul li img { + float: right; + padding: .5em 0 0 .3em; +} +#media__tree ul li li { + margin-left: 0; + margin-right: 1.5em; } -div.meta div.doc { - text-align: left; +#media__content a.mediafile { + margin-right: 0; + margin-left: 1.5em; +} +#media__content div.detail div.thumb { + float: right; + margin: 0 18px 0 .5em; +} +#media__content form.meta div.metafield { + clear: right; } +#media__content form.meta label { + float: right; + clear: right; +} +#media__content form.meta .edit { + float: right; +} +#media__content form.meta div.buttons { + clear: right; + margin: .2em 25% 0 0; +} + -/* ------------------ Design corrections --------------------------------- */ +/*____________ _links ____________*/ -div.dokuwiki ul, -div.dokuwiki ol { - margin: 0.5em 1.5em 0.5em 0; +/* if link icons don't work as expected, remove the following lines */ +.dokuwiki a.urlextern, +.dokuwiki a.windows, +.dokuwiki a.mail, +.dokuwiki a.interwiki, +.dokuwiki a.mediafile { + background-position: right center; + padding: 0 17px 0 0; } -div.dokuwiki a.urlextern, -div.dokuwiki a.interwiki, -div.dokuwiki a.windows, -div.dokuwiki a.mail, -div.dokuwiki a.mail.JSnocheck { - /* should work but doesn't - so we just disable icons here*/ - /* - background-position: right 1px; - padding-right: 16px; - */ - background-image: none !important; - padding: 0px 0px 0px 0px; + +/*____________ _toc ____________*/ + +.dokuwiki div.toc { + float: left; + margin: 0 1.4em 1.4em 0; +} +.dokuwiki .toc span.toc_open, +.dokuwiki .toc span.toc_close { + float: left; + margin: 0 0 0 .2em; +} +.dokuwiki #toc__inside ul ul { + padding-left: 0; + padding-right: 1em; +} +.dokuwiki ul.idx { + padding-right: 0; } -div.dokuwiki div.secedit input.button { - float: left; + +/*____________ _footnotes ____________*/ + + +/*____________ _search ____________*/ + +.dokuwiki div.search_quickresult ul li { + float: right; } +.dokuwiki form.search div.ajax_qsearch { + left: auto; + right: -13.5em; + text-align: right; +} + + +/*____________ _recent ____________*/ -/* headlines */ -div.dokuwiki h1, div.dokuwiki h2, div.dokuwiki h3, div.dokuwiki h4, div.dokuwiki h5 { - clear: right; +.dokuwiki #dw__recent ul li, +.dokuwiki #page__revisions ul li { + margin-right: 0; } -/* 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;} +/*____________ _diff ____________*/ -/* TOC control */ -div.dokuwiki div.toc { - float: left; + +/*____________ _edit ____________*/ + +.dokuwiki div.toolbar #draft__status { + float: left; +} +.dokuwiki #wiki__editbar #size__ctl { + float: left; +} +.dokuwiki #wiki__editbar #size__ctl img { + cursor: pointer; +} +.dokuwiki #wiki__editbar .editButtons { + margin-right: 0; + margin-left: 1em; } -div.dokuwiki div.tocheader { - text-align: right; +.dokuwiki .secedit { + float: left; } -div.dokuwiki #toc__inside { - text-align: right; + +/*____________ _modal ____________*/ + +#link__wiz_close { + float: left; +} +#link__wiz_result { + text-align: right; } +#link__wiz_result div.type_u, +#link__wiz_result div.type_f, +#link__wiz_result div.type_d { + padding: 3px 22px 3px 3px; + background-position: 257px 3px; +} + -div.dokuwiki ul.toc { - padding: 0; - padding-right: 1em; +/*____________ _forms ____________*/ + +.dokuwiki label.block { + text-align: left; +} +.dokuwiki label.simple { + text-align: right; } -div.dokuwiki ul.toc li { - background-position: right 0.6em; - padding-right:0.4em; - direction: rtl; +form#subscribe__form fieldset { + text-align: right; } -div.dokuwiki ul.toc li.clear { - padding-right:0.4em; + +/*____________ _admin ____________*/ + +.dokuwiki ul.admin_tasks { + float: right; +} +.dokuwiki ul.admin_tasks li { + padding-left: 0; + padding-right: 35px; + background-position: right 0; } -div.dokuwiki pre { - text-align: left; +.dokuwiki #admin__version { + clear: right; + float: left; } + +/*____________ includes ____________*/ + + diff --git a/style.ini b/style.ini index 9a16508e1..9dfbb3ce4 100644 --- a/style.ini +++ b/style.ini @@ -24,9 +24,9 @@ css/_edit.css = screen css/_modal.css = screen css/_forms.css = screen css/_admin.css = screen -;css/includes.css = screen +css/includes.css = screen -;css/rtl.css = rtl +css/rtl.css = rtl ;css/print.css = print -- cgit v1.2.3 From 922090dfa40a54e4e3509dc218015b4fbdc64f01 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Sun, 7 Nov 2010 21:40:09 +0000 Subject: added basic print styles --- css/print.css | 128 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ style.ini | 2 +- 2 files changed, 129 insertions(+), 1 deletion(-) diff --git a/css/print.css b/css/print.css index 8b1378917..01214564f 100644 --- a/css/print.css +++ b/css/print.css @@ -1 +1,129 @@ +/** + * This file provides the styles for printing. + * + * @todo: improve and finish + */ +body { + /* + font: normal 12pt/1.2 serif; + color: #000; + background-color: #fff; + */ +} + +/* hide certain sections */ +.a11y, +div.notify, div.info, div.success, div.error, +#dokuwiki__header .tools, #dokuwiki__aside, +.dokuwiki .breadcrumbs, .dokuwiki .toc, .dokuwiki .secedit, +#dokuwiki__pagetools, #dokuwiki__footer { + display: none; +} + +.dokuwiki h1, .dokuwiki h2, .dokuwiki h3, .dokuwiki h4, .dokuwiki h5, +.dokuwiki caption, .dokuwiki legend { + clear: both; +} +.dokuwiki ul { list-style: disc outside; } +.dokuwiki ol { list-style: decimal outside; } +.dokuwiki ol ol { list-style-type: lower-alpha; } +.dokuwiki ol ol ol { list-style-type: upper-roman; } +.dokuwiki ol ol ol ol { list-style-type: upper-alpha; } +.dokuwiki ol ol ol ol ol { list-style-type: lower-roman; } + +/* undo icons */ +.dokuwiki a:link, .dokuwiki a:visited { + text-decoration: underline; + color: #333; + background-color: inherit; + background-image: none; + padding: 0; +} + +/* display href after link */ +a.urlextern:after, +a.interwiki:after, +a.mail:after { + content: " [" attr(href) "]"; + font-size: 90%; +} + +/* undo section indenting */ +.dokuwiki h1, .dokuwiki h2, .dokuwiki h3, .dokuwiki h4, .dokuwiki h5, +.dokuwiki div.level1, .dokuwiki div.level2, .dokuwiki div.level3, .dokuwiki div.level4, .dokuwiki div.level5 { + margin-left: 0; +} + +/* code blocks */ +.dokuwiki pre { + font-family: monospace; +} +.dokuwiki dl.code dt, .dokuwiki dl.file dt { + font-weight: bold; +} + +/* images */ +.dokuwiki img { border-width: 0; vertical-align: middle; } +.dokuwiki img.medialeft { margin: .5em 1.5em .5em 0; float: left; } +.dokuwiki img.mediaright { margin: .5em 0 .5em 1.5em; float: right; } +.dokuwiki img.mediacenter { margin: .5em auto; display: block; } + +/* align table cells */ +.dokuwiki .leftalign { text-align: left; } +.dokuwiki .centeralign { text-align: center; } +.dokuwiki .rightalign { text-align: right; } + +/* underline */ +.dokuwiki em.u { font-style: normal; text-decoration: underline; } +.dokuwiki em em.u { font-style: italic; } + +div.clearer { + clear: both; + line-height: 0; + height: 0; + overflow: hidden; +} + +.dokuwiki blockquote { + padding: 0 10pt; + margin: 0; + border: solid #ccc; + border-width: 0 0 0 2pt; +} + +/* tables */ +.dokuwiki table { + border-collapse: collapse; + empty-cells: show; + border-spacing: 0; + border: 1pt solid #ccc; +} +.dokuwiki th, .dokuwiki td { + padding: 3pt 5pt; + margin: 0; + vertical-align: top; + border: 1pt solid #666; + text-align: left; +} +.dokuwiki th { + font-weight: bold; +} + + +/*____________ a bit of layout ____________*/ + +#dokuwiki__header { + border-bottom: 2pt solid #ccc; +} +#dokuwiki__header h1 { + font-size: 1.5em; +} +#dokuwiki__header h1 a { + text-decoration: none; +} +.dokuwiki div.footnotes { + clear: both; + border-top: 1pt solid #000; + margin-top: 10pt; +} diff --git a/style.ini b/style.ini index 9dfbb3ce4..636b4b6f3 100644 --- a/style.ini +++ b/style.ini @@ -27,7 +27,7 @@ css/_admin.css = screen css/includes.css = screen css/rtl.css = rtl -;css/print.css = print +css/print.css = print ; This section is used to configure some placeholder values used in -- cgit v1.2.3 From 767b821369e9b49d86ecbc633a6305cee2ce1fb4 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Sun, 7 Nov 2010 22:42:40 +0000 Subject: version 2010-11-07 --- README | 2 +- css/content.css | 20 ++++++++++---------- css/print.css | 6 ------ css/rtl.css | 20 ++++++++++---------- 4 files changed, 21 insertions(+), 27 deletions(-) diff --git a/README b/README index 46f8187ca..978199c92 100644 --- a/README +++ b/README @@ -1,5 +1,5 @@ Starter Template for DokuWiki http://www.dokuwiki.org/template:starter -version: (devel) +version: 2010-11-07 author: Anika Henke diff --git a/css/content.css b/css/content.css index 2426b51e8..0d405c2bc 100644 --- a/css/content.css +++ b/css/content.css @@ -8,16 +8,16 @@ /*____________ section indenting ____________ -.dokuwiki h1 {margin-left: 0;} -.dokuwiki h2 {margin-left: .666em;} -.dokuwiki h3 {margin-left: 1.776em;} -.dokuwiki h4 {margin-left: 3em;} -.dokuwiki h5 {margin-left: 4.5712em;} -.dokuwiki div.level1 {margin-left: 0;} -.dokuwiki div.level2 {margin-left: 1em;} -.dokuwiki div.level3 {margin-left: 2em;} -.dokuwiki div.level4 {margin-left: 3em;} -.dokuwiki div.level5 {margin-left: 4em;} +.dokuwiki.page h1 {margin-left: 0;} +.dokuwiki.page h2 {margin-left: .666em;} +.dokuwiki.page h3 {margin-left: 1.776em;} +.dokuwiki.page h4 {margin-left: 3em;} +.dokuwiki.page h5 {margin-left: 4.5712em;} +.dokuwiki.page div.level1 {margin-left: 0;} +.dokuwiki.page div.level2 {margin-left: 1em;} +.dokuwiki.page div.level3 {margin-left: 2em;} +.dokuwiki.page div.level4 {margin-left: 3em;} +.dokuwiki.page div.level5 {margin-left: 4em;} */ /* hx margin-left = (1 / font-size) * .levelx-margin */ diff --git a/css/print.css b/css/print.css index 01214564f..9171bc9ae 100644 --- a/css/print.css +++ b/css/print.css @@ -49,12 +49,6 @@ a.mail:after { font-size: 90%; } -/* undo section indenting */ -.dokuwiki h1, .dokuwiki h2, .dokuwiki h3, .dokuwiki h4, .dokuwiki h5, -.dokuwiki div.level1, .dokuwiki div.level2, .dokuwiki div.level3, .dokuwiki div.level4, .dokuwiki div.level5 { - margin-left: 0; -} - /* code blocks */ .dokuwiki pre { font-family: monospace; diff --git a/css/rtl.css b/css/rtl.css index e15b958f8..5940ce5e5 100644 --- a/css/rtl.css +++ b/css/rtl.css @@ -71,16 +71,16 @@ caption, legend { /*____________ content ____________*/ /* section indenting -.dokuwiki h1 {margin-left: 0; margin-right: 0;} -.dokuwiki h2 {margin-left: 0; margin-right: .666em;} -.dokuwiki h3 {margin-left: 0; margin-right: 1.776em;} -.dokuwiki h4 {margin-left: 0; margin-right: 3em;} -.dokuwiki h5 {margin-left: 0; margin-right: 4.5712em;} -.dokuwiki div.level1 {margin-left: 0; margin-right: 0;} -.dokuwiki div.level2 {margin-left: 0; margin-right: 1em;} -.dokuwiki div.level3 {margin-left: 0; margin-right: 2em;} -.dokuwiki div.level4 {margin-left: 0; margin-right: 3em;} -.dokuwiki div.level5 {margin-left: 0; margin-right: 4em;} +.dokuwiki .page h1 {margin-left: 0; margin-right: 0;} +.dokuwiki .page h2 {margin-left: 0; margin-right: .666em;} +.dokuwiki .page h3 {margin-left: 0; margin-right: 1.776em;} +.dokuwiki .page h4 {margin-left: 0; margin-right: 3em;} +.dokuwiki .page h5 {margin-left: 0; margin-right: 4.5712em;} +.dokuwiki .page div.level1 {margin-left: 0; margin-right: 0;} +.dokuwiki .page div.level2 {margin-left: 0; margin-right: 1em;} +.dokuwiki .page div.level3 {margin-left: 0; margin-right: 2em;} +.dokuwiki .page div.level4 {margin-left: 0; margin-right: 3em;} +.dokuwiki .page div.level5 {margin-left: 0; margin-right: 4em;} */ .dokuwiki dl.code dt, -- cgit v1.2.3 From e45de887c46f62fb53bb0763ca6e292244d4d1c3 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Tue, 9 Nov 2010 22:50:44 +0000 Subject: improved include hooks * moved footer and pageheader into main div * removed header * renamed pageheader to header --- main.php | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/main.php b/main.php index 0150d37cc..c6fbdd4d8 100644 --- a/main.php +++ b/main.php @@ -26,13 +26,13 @@ $showTools = !tpl_getConf('hideTools') || ( tpl_getConf('hideTools') && $_SERVER - are added to make it possible to e.g. style a page differently if it's in edit mode, see http://www.dokuwiki.org/devel:action_modes for a list of action modes */ ?>
+
@@ -99,7 +99,6 @@ $showTools = !tpl_getConf('hideTools') || ( tpl_getConf('hideTools') && $_SERVER
-
@@ -159,10 +158,9 @@ $showTools = !tpl_getConf('hideTools') || ( tpl_getConf('hideTools') && $_SERVER
- +
-
-- cgit v1.2.3 From 944cc648af4cedf82c105b9c21195262c71ec978 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Sat, 13 Nov 2010 20:35:39 +0100 Subject: added missing subscribe link highlighting --- css/design.css | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/css/design.css b/css/design.css index 945ebd722..d3ef4e29a 100644 --- a/css/design.css +++ b/css/design.css @@ -91,7 +91,8 @@ .mode_recent a.action.recent, .mode_index a.action.index, .mode_revisions a.action.revs, -.mode_backlink a.action.backlink { +.mode_backlink a.action.backlink, +.mode_subscribe a.action.subscribe { font-weight: bold; } -- cgit v1.2.3 From 73956eefe6d3ee11ddfa41ec0d17a6e78fb249a6 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Sat, 13 Nov 2010 20:45:42 +0100 Subject: added comment about new favicon core function --- main.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main.php b/main.php index c6fbdd4d8..05829d192 100644 --- a/main.php +++ b/main.php @@ -18,7 +18,7 @@ $showTools = !tpl_getConf('hideTools') || ( tpl_getConf('hideTools') && $_SERVER <?php tpl_pagetitle() ?> [<?php echo strip_tags($conf['title']) ?>] - + -- cgit v1.2.3 From 8a601ab2a465ea1d72e5f693c05f847e4f48d18d Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Sat, 4 Dec 2010 11:17:11 +0000 Subject: fixed vertical alignment in recent changes and revisions for showuseras=email_link --- css/_recent.css | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/css/_recent.css b/css/_recent.css index 9e35c1270..98646e057 100644 --- a/css/_recent.css +++ b/css/_recent.css @@ -10,10 +10,16 @@ list-style: none; margin-left: 0; } -.dokuwiki #dw__recent ul li *, -.dokuwiki #page__revisions ul li * { +.dokuwiki #dw__recent ul li span, +.dokuwiki #dw__recent ul li a, +.dokuwiki #page__revisions ul li span, +.dokuwiki #page__revisions ul li a { vertical-align: middle; } +.dokuwiki #dw__recent ul li span.user a, +.dokuwiki #page__revisions ul li span.user a { + vertical-align: bottom; +} .dokuwiki #dw__recent ul li.minor, .dokuwiki #page__revisions ul li.minor { color: __text_alt__; -- cgit v1.2.3 From 1a173f95f099c64f6bead1da03624a1c0bc6947d Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Sat, 4 Dec 2010 11:31:22 +0000 Subject: changed preview to look more like the real resulting page --- css/_edit.css | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/css/_edit.css b/css/_edit.css index a17df77f7..b308a45bf 100644 --- a/css/_edit.css +++ b/css/_edit.css @@ -93,11 +93,10 @@ div.picker button.pickerbutton { ********************************************************************/ .dokuwiki div.preview { - background-color: __background_neu__; - color: __text__; + border: dashed __border__; + border-width: .2em 0; + padding: 1.4em 0; margin-bottom: 1.4em; - padding: .5em; - border: 1px dotted __text_neu__; } /* section edit buttons -- cgit v1.2.3 From edf68fefc43225112f5716e003568733d374afad Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Sat, 4 Dec 2010 11:56:09 +0000 Subject: fixed formatting for combined styles (#1) --- css/basic.css | 3 ++- css/content.css | 4 ++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/css/basic.css b/css/basic.css index b9045dcbc..d0f44e84a 100644 --- a/css/basic.css +++ b/css/basic.css @@ -170,8 +170,9 @@ acronym, abbr { } pre, code, samp, kbd { - font: normal 1em Consolas, "Andale Mono WT", "Andale Mono", "Bitstream Vera Sans Mono", "Liberation Mono", Monaco, "Courier New", monospace; + font-family: Consolas, "Andale Mono WT", "Andale Mono", "Bitstream Vera Sans Mono", "Liberation Mono", Monaco, "Courier New", monospace; /* same font stack should be used for ".dokuwiki table.diff td" in _diff.css */ + font-size: 1em; direction: ltr; text-align: left; } diff --git a/css/content.css b/css/content.css index 0d405c2bc..fae5dc1c1 100644 --- a/css/content.css +++ b/css/content.css @@ -64,6 +64,10 @@ background-color: __background_alt__; color: inherit; } +/* fix if background-color hides underlining */ +.dokuwiki em.u code { + text-decoration: underline; +} .dokuwiki pre { border: 1px solid __border__; padding: 0 .2em; -- cgit v1.2.3 From ac045c3d94e562298116af49fee172d69870477d Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Sat, 4 Dec 2010 12:18:13 +0000 Subject: removed text-align from body to allow automatic text-alignment --- css/basic.css | 1 - css/rtl.css | 1 - 2 files changed, 2 deletions(-) diff --git a/css/basic.css b/css/basic.css index d0f44e84a..ef209d54a 100644 --- a/css/basic.css +++ b/css/basic.css @@ -21,7 +21,6 @@ html, body { body { font: normal 100%/1.4 Frutiger, "Frutiger Linotype", Univers, Calibri, Myriad, "Liberation Sans", Tahoma, Geneva, "Helvetica Neue", Helvetica, Arial, sans-serif; /* default font size: 100% => 16px; 93.75% => 15px; 87.5% => 14px; 81.25% => 13px; 75% => 12px */ - text-align: left; } diff --git a/css/rtl.css b/css/rtl.css index 5940ce5e5..33b730f12 100644 --- a/css/rtl.css +++ b/css/rtl.css @@ -7,7 +7,6 @@ /*____________ basic ____________*/ -body, caption, td, th { -- cgit v1.2.3 From c21fe1fab827d3d35d3cf59b0f6403f005e86df2 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Sat, 4 Dec 2010 15:26:46 +0000 Subject: changed font sizes of license and section edit buttons --- css/_edit.css | 3 +++ css/content.css | 27 --------------------------- css/design.css | 2 +- 3 files changed, 4 insertions(+), 28 deletions(-) diff --git a/css/_edit.css b/css/_edit.css index b308a45bf..88ebcf15c 100644 --- a/css/_edit.css +++ b/css/_edit.css @@ -106,6 +106,9 @@ div.picker button.pickerbutton { float: right; margin-top: -1.4em; } +.dokuwiki .secedit input.button { + font-size: 75%; +} .dokuwiki .section_highlight { background-color: __background_alt__ !important; color: inherit; diff --git a/css/content.css b/css/content.css index fae5dc1c1..57c313d6c 100644 --- a/css/content.css +++ b/css/content.css @@ -100,30 +100,3 @@ margin: 0; } - -/*____________ misc ____________*/ - -/* license note in footer and under edit window */ -.dokuwiki div.license { - font-size: 90%; -} - -#IE6 .dokuwiki input.button, #IE6 .dokuwiki button, -#IE7 .dokuwiki input.button, #IE7 .dokuwiki button { - line-height: 1.4; -} - -/*____________ JS popup ____________*/ - -.JSpopup { - background-color: __background__; - color: __text__; - border: 1px solid __border__; - line-height: 1.2; - padding: 0 .2em; -} - -.JSpopup ul, -.JSpopup ol { - padding-left: 0; -} diff --git a/css/design.css b/css/design.css index d3ef4e29a..37a5625d6 100644 --- a/css/design.css +++ b/css/design.css @@ -194,7 +194,7 @@ /* license note in footer and under edit window */ .dokuwiki div.license { - font-size: 90%; + font-size: 93.75%; } #IE6 .dokuwiki input.button, #IE6 .dokuwiki button, -- cgit v1.2.3 From afe47fae3b5d4dbb4c209df698b72d4f2e716ad7 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Sun, 5 Dec 2010 13:01:15 +0000 Subject: made template functions more flexible * attention: incompatible to previous version! * introduced _tpl_action() (wrapper similar to tpl_action()) * improved discussion and user page functions * made them work independent from config * added full control to how the page links are built (with placeholders @ID@ and @USER@) * config option changes: removed 'discussNSreverse', renamed 'discussionNS' and 'userNS' to 'discussionPage' and 'userPage' --- conf/default.php | 5 ++--- conf/metadata.php | 5 ++--- lang/en/settings.php | 5 ++--- main.php | 8 ++------ tpl_functions.php | 53 +++++++++++++++++++++++++++++++++------------------- 5 files changed, 42 insertions(+), 34 deletions(-) diff --git a/conf/default.php b/conf/default.php index e5bce5e9d..57b7bd581 100644 --- a/conf/default.php +++ b/conf/default.php @@ -5,8 +5,7 @@ */ $conf['tagline'] = 'This is the tagline - explaining what this site is about.'; -$conf['discussionNS'] = 'discussion'; -$conf['discussNSreverse'] = 0; -$conf['userNS'] = 'user'; +$conf['discussionPage'] = 'discussion:@ID@'; +$conf['userPage'] = 'user:@USER@:'; $conf['sidebarID'] = 'sidebar'; $conf['hideTools'] = 0; diff --git a/conf/metadata.php b/conf/metadata.php index 792c47ae2..88583bcd0 100644 --- a/conf/metadata.php +++ b/conf/metadata.php @@ -5,8 +5,7 @@ */ $meta['tagline'] = array('string'); -$meta['discussionNS'] = array('string'); -$meta['discussNSreverse'] = array('onoff'); -$meta['userNS'] = array('string'); +$meta['discussionPage'] = array('string'); +$meta['userPage'] = array('string'); $meta['sidebarID'] = array('string'); $meta['hideTools'] = array('onoff'); diff --git a/lang/en/settings.php b/lang/en/settings.php index e2fde20c4..356e95234 100644 --- a/lang/en/settings.php +++ b/lang/en/settings.php @@ -5,8 +5,7 @@ */ $lang['tagline'] = 'Tagline'; -$lang['discussionNS'] = 'Discussion namespace (leave empty to disable discussions)'; -$lang['discussNSreverse'] = 'Reverse discussion namespace? (e.g. "foo:bar:discussion" instead of "discussion:foo:bar")'; -$lang['userNS'] = 'User namespace (leave empty to disable user pages)'; +$lang['discussionPage'] = 'Discussion page (leave empty to disable discussions)'; +$lang['userPage'] = 'User page (leave empty to disable user pages)'; $lang['sidebarID'] = 'page name of page included in sidebar'; $lang['hideTools'] = 'Hide tools when not logged in?'; diff --git a/main.php b/main.php index 05829d192..d47f8d359 100644 --- a/main.php +++ b/main.php @@ -66,9 +66,7 @@ $showTools = !tpl_getConf('hideTools') || ( tpl_getConf('hideTools') && $_SERVER echo ''; } tpl_action('admin', 1, 'li'); - if (tpl_getConf('userNS')) { - _tpl_userpage(tpl_getConf('userNS'),1,'li'); - } + _tpl_action('userpage', 1, 'li'); tpl_action('profile', 1, 'li'); tpl_action('login', 1, 'li'); ?> @@ -138,9 +136,7 @@ $showTools = !tpl_getConf('hideTools') || ( tpl_getConf('hideTools') && $_SERVER
    */ -function _tpl_discussion($discussNS='discussion',$link=0,$wrapper=0,$reverse=0) { +function _tpl_discussion($discussionPage,$title,$backTitle,$link=0,$wrapper=0) { global $ID; - if ($reverse) { - $discussPage = $ID.':'.$discussNS; - $isDiscussPage = substr($ID,-strlen($discussNS),strlen($discussNS))==$discussNS; - $backID = substr($ID,0,-strlen($discussNS)); - } else { - $discussPage = $discussNS.':'.$ID; - $isDiscussPage = substr($ID,0,strlen($discussNS))==$discussNS; - $backID = strstr($ID,':'); - } + $discussPage = str_replace('@ID@',$ID,$discussionPage); + $discussPageRaw = str_replace('@ID@','',$discussionPage); + $isDiscussPage = strpos($ID,$discussPageRaw)!==false; + $backID = str_replace($discussPageRaw,'',$ID); if ($wrapper) echo "<$wrapper>"; - if($isDiscussPage) { + if ($isDiscussPage) { if ($link) - tpl_pagelink($backID,tpl_getLang('back_to_article')); + tpl_pagelink($backID,$backTitle); else - echo html_btn('back2article',$backID,'',array(),0,0,tpl_getLang('back_to_article')); + echo html_btn('back2article',$backID,'',array(),0,0,$backTitle); } else { if ($link) - tpl_pagelink($discussPage,tpl_getLang('discussion')); + tpl_pagelink($discussPage,$title); else - echo html_btn('discussion',$discussPage,'',array(),0,0,tpl_getLang('discussion')); + echo html_btn('discussion',$discussPage,'',array(),0,0,$title); } if ($wrapper) echo ""; @@ -51,22 +46,42 @@ function _tpl_discussion($discussNS='discussion',$link=0,$wrapper=0,$reverse=0) * * @author Anika Henke */ -function _tpl_userpage($userNS='user',$link=0,$wrapper=false) { +function _tpl_userpage($userPage,$title,$link=0,$wrapper=0) { if (!$_SERVER['REMOTE_USER']) return; global $conf; - $userPage = $userNS.':'.$_SERVER['REMOTE_USER'].':'.$conf['start']; + $userPage = str_replace('@USER@',$_SERVER['REMOTE_USER'],$userPage); if ($wrapper) echo "<$wrapper>"; if ($link) - tpl_pagelink($userPage,tpl_getLang('userpage')); + tpl_pagelink($userPage,$title); else - echo html_btn('userpage',$userPage,'',array(),0,0,tpl_getLang('userpage')); + echo html_btn('userpage',$userPage,'',array(),0,0,$title); if ($wrapper) echo ""; } +/** + * Wrapper around custom template actions + * + * @author Anika Henke + */ +function _tpl_action($type,$link=0,$wrapper=0) { + switch ($type) { + case 'discussion': + if (tpl_getConf('discussionPage')) { + _tpl_discussion(tpl_getConf('discussionPage'),tpl_getLang('discussion'),tpl_getLang('back_to_article'),$link,$wrapper); + } + break; + case 'userpage': + if (tpl_getConf('userPage')) { + _tpl_userpage(tpl_getConf('userPage'),tpl_getLang('userpage'),$link,$wrapper); + } + break; + } +} + /** * Use favicon.ico from data/media root directory if it exists, otherwise use * the one in the template's image directory. -- cgit v1.2.3 From b19d382409f25e451fdee2e9c71944817b2672f4 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Sun, 2 Jan 2011 00:18:55 +0000 Subject: added 'Discussion' translation into many languages --- lang/ar/lang.php | 10 ++++++++++ lang/ca/lang.php | 10 ++++++++++ lang/cs/lang.php | 10 ++++++++++ lang/da/lang.php | 11 +++++++++++ lang/de/lang.php | 18 ++++++++++++++++++ lang/eo/lang.php | 10 ++++++++++ lang/es/lang.php | 10 ++++++++++ lang/et/lang.php | 10 ++++++++++ lang/eu/lang.php | 10 ++++++++++ lang/fi/lang.php | 10 ++++++++++ lang/fr/lang.php | 10 ++++++++++ lang/he/lang.php | 10 ++++++++++ lang/hu/lang.php | 10 ++++++++++ lang/id/lang.php | 10 ++++++++++ lang/it/lang.php | 10 ++++++++++ lang/ja/lang.php | 10 ++++++++++ lang/ko/lang.php | 10 ++++++++++ lang/lt/lang.php | 10 ++++++++++ lang/lv/lang.php | 10 ++++++++++ lang/nl/lang.php | 10 ++++++++++ lang/no/lang.php | 10 ++++++++++ lang/pl/lang.php | 10 ++++++++++ lang/pt-br/lang.php | 10 ++++++++++ lang/pt/lang.php | 10 ++++++++++ lang/ro/lang.php | 10 ++++++++++ lang/ru/lang.php | 10 ++++++++++ lang/sk/lang.php | 10 ++++++++++ lang/sl/lang.php | 10 ++++++++++ lang/sr/lang.php | Bin 0 -> 300 bytes lang/sv/lang.php | 10 ++++++++++ lang/tr/lang.php | 10 ++++++++++ lang/vi/lang.php | 10 ++++++++++ lang/zh-tw/lang.php | 10 ++++++++++ lang/zh/lang.php | 10 ++++++++++ 34 files changed, 339 insertions(+) create mode 100644 lang/ar/lang.php create mode 100644 lang/ca/lang.php create mode 100644 lang/cs/lang.php create mode 100644 lang/da/lang.php create mode 100644 lang/de/lang.php create mode 100644 lang/eo/lang.php create mode 100644 lang/es/lang.php create mode 100644 lang/et/lang.php create mode 100644 lang/eu/lang.php create mode 100644 lang/fi/lang.php create mode 100644 lang/fr/lang.php create mode 100644 lang/he/lang.php create mode 100644 lang/hu/lang.php create mode 100644 lang/id/lang.php create mode 100644 lang/it/lang.php create mode 100644 lang/ja/lang.php create mode 100644 lang/ko/lang.php create mode 100644 lang/lt/lang.php create mode 100644 lang/lv/lang.php create mode 100644 lang/nl/lang.php create mode 100644 lang/no/lang.php create mode 100644 lang/pl/lang.php create mode 100644 lang/pt-br/lang.php create mode 100644 lang/pt/lang.php create mode 100644 lang/ro/lang.php create mode 100644 lang/ru/lang.php create mode 100644 lang/sk/lang.php create mode 100644 lang/sl/lang.php create mode 100644 lang/sr/lang.php create mode 100644 lang/sv/lang.php create mode 100644 lang/tr/lang.php create mode 100644 lang/vi/lang.php create mode 100644 lang/zh-tw/lang.php create mode 100644 lang/zh/lang.php diff --git a/lang/ar/lang.php b/lang/ar/lang.php new file mode 100644 index 000000000..d88c2c22e --- /dev/null +++ b/lang/ar/lang.php @@ -0,0 +1,10 @@ + Date: Mon, 3 Jan 2011 01:02:47 +0000 Subject: fixed wrong form method for buttons --- tpl_functions.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tpl_functions.php b/tpl_functions.php index fcd50585a..784813272 100644 --- a/tpl_functions.php +++ b/tpl_functions.php @@ -30,12 +30,12 @@ function _tpl_discussion($discussionPage,$title,$backTitle,$link=0,$wrapper=0) { if ($link) tpl_pagelink($backID,$backTitle); else - echo html_btn('back2article',$backID,'',array(),0,0,$backTitle); + echo html_btn('back2article',$backID,'',array(),'get',0,$backTitle); } else { if ($link) tpl_pagelink($discussPage,$title); else - echo html_btn('discussion',$discussPage,'',array(),0,0,$title); + echo html_btn('discussion',$discussPage,'',array(),'get',0,$title); } if ($wrapper) echo ""; @@ -57,7 +57,7 @@ function _tpl_userpage($userPage,$title,$link=0,$wrapper=0) { if ($link) tpl_pagelink($userPage,$title); else - echo html_btn('userpage',$userPage,'',array(),0,0,$title); + echo html_btn('userpage',$userPage,'',array(),'get',0,$title); if ($wrapper) echo ""; } -- cgit v1.2.3 From 383a53f459aaeed3cad97bfbcf22d22a7be87de9 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Mon, 3 Jan 2011 20:53:49 +0000 Subject: made include hooks more flexible (especially for farms: put included file into conf directory) --- main.php | 10 +++++----- tpl_functions.php | 16 ++++++++++++++++ 2 files changed, 21 insertions(+), 5 deletions(-) diff --git a/main.php b/main.php index d47f8d359..09eb125c4 100644 --- a/main.php +++ b/main.php @@ -19,7 +19,7 @@ $showTools = !tpl_getConf('hideTools') || ( tpl_getConf('hideTools') && $_SERVER <?php tpl_pagetitle() ?> [<?php echo strip_tags($conf['title']) ?>] - + @@ -32,7 +32,7 @@ $showTools = !tpl_getConf('hideTools') || ( tpl_getConf('hideTools') && $_SERVER
    - +
    @@ -113,7 +113,7 @@ $showTools = !tpl_getConf('hideTools') || ( tpl_getConf('hideTools') && $_SERVER
    - +
    @@ -123,7 +123,7 @@ $showTools = !tpl_getConf('hideTools') || ( tpl_getConf('hideTools') && $_SERVER
    - +
    @@ -154,7 +154,7 @@ $showTools = !tpl_getConf('hideTools') || ( tpl_getConf('hideTools') && $_SERVER
    - +
    diff --git a/tpl_functions.php b/tpl_functions.php index 784813272..cadf400e4 100644 --- a/tpl_functions.php +++ b/tpl_functions.php @@ -93,3 +93,19 @@ function _tpl_getFavicon() { return ml('favicon.ico'); return DOKU_TPL.'images/favicon.ico'; } + +/** + * Include additional html file from conf directory if it exists, otherwise use + * file in the template's root directory. + * + * @author Anika Henke + */ +function _tpl_include($fn) { + $confFile = DOKU_CONF.$fn; + $tplFile = dirname(__FILE__).'/'.$fn; + + if (file_exists($confFile)) + include($confFile); + else if (file_exists($tplFile)) + include($tplFile); +} -- cgit v1.2.3 From 49dd4a833a88fe4b5045b1081ffb78369be2ff06 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Fri, 4 Feb 2011 02:02:57 +0000 Subject: added register link --- css/design.css | 2 ++ main.php | 1 + tpl_functions.php | 25 +++++++++++++++++++++++++ 3 files changed, 28 insertions(+) diff --git a/css/design.css b/css/design.css index 37a5625d6..cfed4f078 100644 --- a/css/design.css +++ b/css/design.css @@ -87,6 +87,8 @@ /* highlight selected tool */ .mode_admin a.action.admin, +.mode_login a.action.login, +.mode_register a.action.register, .mode_profile a.action.profile, .mode_recent a.action.recent, .mode_index a.action.index, diff --git a/main.php b/main.php index 09eb125c4..1fe7749e9 100644 --- a/main.php +++ b/main.php @@ -68,6 +68,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'); tpl_action('login', 1, 'li'); ?>
diff --git a/tpl_functions.php b/tpl_functions.php index cadf400e4..1fc23099d 100644 --- a/tpl_functions.php +++ b/tpl_functions.php @@ -62,6 +62,28 @@ function _tpl_userpage($userPage,$title,$link=0,$wrapper=0) { if ($wrapper) echo ""; } +/** + * Create link/button to register page + * + * @author Anika Henke + */ +function _tpl_register($link=0,$wrapper=0) { + global $conf; + global $lang; + global $ID; + + 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 * @@ -79,6 +101,9 @@ function _tpl_action($type,$link=0,$wrapper=0) { _tpl_userpage(tpl_getConf('userPage'),tpl_getLang('userpage'),$link,$wrapper); } break; + case 'register': + _tpl_register($link,$wrapper); + break; } } -- cgit v1.2.3 From 5670feb5e7f70e33713de5a22180e3a71dd2244a Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Mon, 14 Feb 2011 01:59:10 +0000 Subject: added more translations and new languages --- lang/af/lang.php | 12 ++++++++++++ lang/ar/lang.php | 5 ++++- lang/az/lang.php | 12 ++++++++++++ lang/bg/lang.php | 12 ++++++++++++ lang/ca/lang.php | 5 ++++- lang/cs/lang.php | 4 +++- lang/da/lang.php | 4 +++- lang/el/lang.php | 12 ++++++++++++ lang/eo/lang.php | 1 + lang/es/lang.php | 4 +++- lang/et/lang.php | 5 ++++- lang/eu/lang.php | 4 +++- lang/fa/lang.php | 12 ++++++++++++ lang/fi/lang.php | 5 ++++- lang/fo/lang.php | 11 +++++++++++ lang/fr/lang.php | 4 +++- lang/gl/lang.php | 12 ++++++++++++ lang/he/lang.php | 4 +++- lang/hi/lang.php | 12 ++++++++++++ lang/hr/lang.php | 12 ++++++++++++ lang/hu/lang.php | 4 +++- lang/ia/lang.php | 11 +++++++++++ lang/id/lang.php | 4 +++- lang/is/lang.php | 12 ++++++++++++ lang/it/lang.php | 4 +++- lang/ja/lang.php | 4 +++- lang/km/lang.php | 11 +++++++++++ lang/ko/lang.php | 2 ++ lang/la/lang.php | 11 +++++++++++ lang/lb/lang.php | 11 +++++++++++ lang/lt/lang.php | 4 +++- lang/lv/lang.php | 4 +++- lang/mg/lang.php | 11 +++++++++++ lang/mk/lang.php | 12 ++++++++++++ lang/mr/lang.php | 11 +++++++++++ lang/ne/lang.php | 11 +++++++++++ lang/nl/lang.php | 4 +++- lang/no/lang.php | 4 +++- lang/pl/lang.php | 4 +++- lang/pt-br/lang.php | 4 +++- lang/pt/lang.php | 4 +++- lang/ro/lang.php | 4 +++- lang/ru/lang.php | 4 +++- lang/sk/lang.php | 4 +++- lang/sl/lang.php | 4 +++- lang/sq/lang.php | 12 ++++++++++++ lang/sr/lang.php | Bin 300 -> 158 bytes lang/sv/lang.php | 4 +++- lang/th/lang.php | 12 ++++++++++++ lang/tr/lang.php | 4 +++- lang/uk/lang.php | 12 ++++++++++++ lang/vi/lang.php | 4 +++- lang/zh-tw/lang.php | 4 +++- lang/zh/lang.php | 4 +++- 54 files changed, 341 insertions(+), 30 deletions(-) create mode 100644 lang/af/lang.php create mode 100644 lang/az/lang.php create mode 100644 lang/bg/lang.php create mode 100644 lang/el/lang.php create mode 100644 lang/fa/lang.php create mode 100644 lang/fo/lang.php create mode 100644 lang/gl/lang.php create mode 100644 lang/hi/lang.php create mode 100644 lang/hr/lang.php create mode 100644 lang/ia/lang.php create mode 100644 lang/is/lang.php create mode 100644 lang/km/lang.php create mode 100644 lang/la/lang.php create mode 100644 lang/lb/lang.php create mode 100644 lang/mg/lang.php create mode 100644 lang/mk/lang.php create mode 100644 lang/mr/lang.php create mode 100644 lang/ne/lang.php create mode 100644 lang/sq/lang.php create mode 100644 lang/th/lang.php create mode 100644 lang/uk/lang.php diff --git a/lang/af/lang.php b/lang/af/lang.php new file mode 100644 index 000000000..127ac3076 --- /dev/null +++ b/lang/af/lang.php @@ -0,0 +1,12 @@ + Date: Tue, 15 Feb 2011 00:54:10 +0000 Subject: RTL fixes --- css/rtl.css | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/css/rtl.css b/css/rtl.css index 33b730f12..ebc25d515 100644 --- a/css/rtl.css +++ b/css/rtl.css @@ -28,6 +28,10 @@ caption, legend { clear: right; } +.a11y { + left: auto; + right: -9000px; +} /*____________ structure ____________*/ @@ -63,6 +67,14 @@ caption, legend { margin-left: .5em; } +#dokuwiki__usertools ul li.user { + float: right; + margin-right: 0; +} +#dokuwiki__pagetools ul li a.action.top { + float: left; +} + #dokuwiki__aside ul, #dokuwiki__aside ol { padding-right: 0; } -- cgit v1.2.3 From 4a4cf7c5a662c652e8c1b9b8b70bbfa0876a8946 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Sun, 20 Feb 2011 19:29:16 +0000 Subject: adjusted _tpl_register() to reflect changes in the core --- main.php | 2 +- tpl_functions.php | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/main.php b/main.php index 1fe7749e9..a791552d0 100644 --- a/main.php +++ b/main.php @@ -68,7 +68,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'); + _tpl_action('register', 1, 'li'); /* DW versions > 2011-02-20 can use the core function tpl_action('register', 1, 'li') */ tpl_action('login', 1, 'li'); ?> diff --git a/tpl_functions.php b/tpl_functions.php index 1fc23099d..54b143fc9 100644 --- a/tpl_functions.php +++ b/tpl_functions.php @@ -64,6 +64,7 @@ function _tpl_userpage($userPage,$title,$link=0,$wrapper=0) { /** * Create link/button to register page + * DW versions > 2011-02-20 can use the core function tpl_action('register') * * @author Anika Henke */ @@ -71,15 +72,16 @@ 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"'); + 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']); + echo html_btn('register',$ID,'',array('do'=>'register'),'get',0,$lang_register); if ($wrapper) echo ""; } @@ -110,6 +112,7 @@ function _tpl_action($type,$link=0,$wrapper=0) { /** * Use favicon.ico from data/media root directory if it exists, otherwise use * the one in the template's image directory. + * DW versions > 2010-11-12 can use the core function tpl_getFavicon() * * @author Anika Henke */ -- cgit v1.2.3 From 5ddc68e597151cf473ee7a977de6d6300a3e6b7e Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Sun, 20 Feb 2011 19:54:24 +0000 Subject: added '__sidebar_width__' placeholder to style.ini --- css/rtl.css | 4 ++-- css/structure.css | 6 +++--- main.php | 4 ++-- style.ini | 3 +++ 4 files changed, 10 insertions(+), 7 deletions(-) diff --git a/css/rtl.css b/css/rtl.css index ebc25d515..8b82a45e1 100644 --- a/css/rtl.css +++ b/css/rtl.css @@ -53,11 +53,11 @@ caption, legend { .mode_show #dokuwiki__content { float: left; margin-left: 0; - margin-right: -16em; + margin-right: -__sidebar_width__; } .mode_show #dokuwiki__content .pad { margin-left: 0; - margin-right: 16em; + margin-right: __sidebar_width__; } /*____________ design ____________*/ diff --git a/css/structure.css b/css/structure.css index 7b188dbd6..14490a0b0 100644 --- a/css/structure.css +++ b/css/structure.css @@ -46,7 +46,7 @@ body { display: none; } .mode_show #dokuwiki__aside { - width: 16em; + width: __sidebar_width__; float: left; position: relative; display: block; @@ -58,11 +58,11 @@ body { /* make content wider when there's no sidebar */ .mode_show #dokuwiki__content { float: right; - margin-left: -16em; /* left negative margin: width of sidebar (#dokuwiki__aside) */ + margin-left: -__sidebar_width__; width: 100%; } .mode_show #dokuwiki__content .pad { - margin-left: 16em; /* left positive margin: width of sidebar (#dokuwiki__aside) */ + margin-left: __sidebar_width__; } #dokuwiki__footer { diff --git a/main.php b/main.php index a791552d0..004421c3e 100644 --- a/main.php +++ b/main.php @@ -92,10 +92,10 @@ $showTools = !tpl_getConf('hideTools') || ( tpl_getConf('hideTools') && $_SERVER -
+
-
+
diff --git a/style.ini b/style.ini index 636b4b6f3..ef5e0201e 100644 --- a/style.ini +++ b/style.ini @@ -59,3 +59,6 @@ __missing__ = "#f30" ; highlighting search snippets __highlight__ = "#ff9" + +; sidebar width +__sidebar_width__ = "16em" -- cgit v1.2.3 From d07ea3739d8e6580641e84d4f3b14df6e0c9fd70 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Sun, 20 Feb 2011 19:54:57 +0000 Subject: version 2011-02-20 --- README | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README b/README index 978199c92..966fc45f1 100644 --- a/README +++ b/README @@ -1,5 +1,5 @@ Starter Template for DokuWiki http://www.dokuwiki.org/template:starter -version: 2010-11-07 +version: 2011-02-20 author: Anika Henke -- cgit v1.2.3 From 5cd857db88e3830b74a73ab9d567c3ce28c014b1 Mon Sep 17 00:00:00 2001 From: Clarence Lee Date: Wed, 10 Aug 2011 18:46:17 +0100 Subject: first rough cut --- README | 5 + conf/default.php | 11 ++ conf/metadata.php | 11 ++ css/_admin.css | 47 ++++++++ css/_diff.css | 65 +++++++++++ css/_edit.css | 115 +++++++++++++++++++ css/_footnotes.css | 28 +++++ css/_forms.css | 82 ++++++++++++++ css/_imgdetail.css | 32 ++++++ css/_links.css | 63 ++++++++++ css/_mediamanager.css | 219 +++++++++++++++++++++++++++++++++++ css/_modal.css | 175 ++++++++++++++++++++++++++++ css/_recent.css | 64 +++++++++++ css/_search.css | 93 +++++++++++++++ css/_toc.css | 91 +++++++++++++++ css/basic.css | 263 ++++++++++++++++++++++++++++++++++++++++++ css/content.css | 102 +++++++++++++++++ css/default.css | 241 +++++++++++++++++++++++++++++++++++++++ css/design.css | 253 +++++++++++++++++++++++++++++++++++++++++ css/includes.css | 4 + css/print.css | 123 ++++++++++++++++++++ css/rtl.css | 309 ++++++++++++++++++++++++++++++++++++++++++++++++++ css/structure.css | 72 ++++++++++++ detail.php | 81 +++++++++++++ images/bullet.png | Bin 0 -> 137 bytes images/closed.png | Bin 0 -> 165 bytes images/favicon.ico | Bin 0 -> 7406 bytes images/link_icon.gif | Bin 0 -> 942 bytes images/mail_icon.gif | Bin 0 -> 918 bytes images/open.png | Bin 0 -> 159 bytes images/windows.gif | Bin 0 -> 223 bytes lang/af/lang.php | 12 ++ lang/ar/lang.php | 13 +++ lang/az/lang.php | 12 ++ lang/bg/lang.php | 12 ++ lang/ca/lang.php | 13 +++ lang/cs/lang.php | 12 ++ lang/da/lang.php | 13 +++ lang/de/lang.php | 18 +++ lang/el/lang.php | 12 ++ lang/en/lang.php | 15 +++ lang/en/settings.php | 11 ++ lang/eo/lang.php | 11 ++ lang/es/lang.php | 12 ++ lang/et/lang.php | 13 +++ lang/eu/lang.php | 12 ++ lang/fa/lang.php | 12 ++ lang/fi/lang.php | 13 +++ lang/fo/lang.php | 11 ++ lang/fr/lang.php | 12 ++ lang/gl/lang.php | 12 ++ lang/he/lang.php | 12 ++ lang/hi/lang.php | 12 ++ lang/hr/lang.php | 12 ++ lang/hu/lang.php | 12 ++ lang/ia/lang.php | 11 ++ lang/id/lang.php | 12 ++ lang/is/lang.php | 12 ++ lang/it/lang.php | 12 ++ lang/ja/lang.php | 12 ++ lang/km/lang.php | 11 ++ lang/ko/lang.php | 12 ++ lang/la/lang.php | 11 ++ lang/lb/lang.php | 11 ++ lang/lt/lang.php | 12 ++ lang/lv/lang.php | 12 ++ lang/mg/lang.php | 11 ++ lang/mk/lang.php | 12 ++ lang/mr/lang.php | 11 ++ lang/ne/lang.php | 11 ++ lang/nl/lang.php | 12 ++ lang/no/lang.php | 12 ++ lang/pl/lang.php | 12 ++ lang/pt-br/lang.php | 12 ++ lang/pt/lang.php | 12 ++ lang/ro/lang.php | 12 ++ lang/ru/lang.php | 12 ++ lang/sk/lang.php | 12 ++ lang/sl/lang.php | 12 ++ lang/sq/lang.php | 12 ++ lang/sr/lang.php | 8 ++ lang/sv/lang.php | 12 ++ lang/th/lang.php | 12 ++ lang/tr/lang.php | 12 ++ lang/uk/lang.php | 12 ++ lang/vi/lang.php | 12 ++ lang/zh-tw/lang.php | 12 ++ lang/zh/lang.php | 12 ++ main.php | 166 +++++++++++++++++++++++++++ mediamanager.php | 40 +++++++ style.ini | 64 +++++++++++ tpl_functions.php | 139 +++++++++++++++++++++++ 92 files changed, 3642 insertions(+) create mode 100755 README create mode 100755 conf/default.php create mode 100755 conf/metadata.php create mode 100755 css/_admin.css create mode 100755 css/_diff.css create mode 100755 css/_edit.css create mode 100755 css/_footnotes.css create mode 100755 css/_forms.css create mode 100755 css/_imgdetail.css create mode 100755 css/_links.css create mode 100755 css/_mediamanager.css create mode 100755 css/_modal.css create mode 100755 css/_recent.css create mode 100755 css/_search.css create mode 100755 css/_toc.css create mode 100755 css/basic.css create mode 100755 css/content.css create mode 100644 css/default.css create mode 100755 css/design.css create mode 100755 css/includes.css create mode 100755 css/print.css create mode 100755 css/rtl.css create mode 100755 css/structure.css create mode 100755 detail.php create mode 100755 images/bullet.png create mode 100755 images/closed.png create mode 100755 images/favicon.ico create mode 100755 images/link_icon.gif create mode 100755 images/mail_icon.gif create mode 100755 images/open.png create mode 100755 images/windows.gif create mode 100755 lang/af/lang.php create mode 100755 lang/ar/lang.php create mode 100755 lang/az/lang.php create mode 100755 lang/bg/lang.php create mode 100755 lang/ca/lang.php create mode 100755 lang/cs/lang.php create mode 100755 lang/da/lang.php create mode 100755 lang/de/lang.php create mode 100755 lang/el/lang.php create mode 100755 lang/en/lang.php create mode 100755 lang/en/settings.php create mode 100755 lang/eo/lang.php create mode 100755 lang/es/lang.php create mode 100755 lang/et/lang.php create mode 100755 lang/eu/lang.php create mode 100755 lang/fa/lang.php create mode 100755 lang/fi/lang.php create mode 100755 lang/fo/lang.php create mode 100755 lang/fr/lang.php create mode 100755 lang/gl/lang.php create mode 100755 lang/he/lang.php create mode 100755 lang/hi/lang.php create mode 100755 lang/hr/lang.php create mode 100755 lang/hu/lang.php create mode 100755 lang/ia/lang.php create mode 100755 lang/id/lang.php create mode 100755 lang/is/lang.php create mode 100755 lang/it/lang.php create mode 100755 lang/ja/lang.php create mode 100755 lang/km/lang.php create mode 100755 lang/ko/lang.php create mode 100755 lang/la/lang.php create mode 100755 lang/lb/lang.php create mode 100755 lang/lt/lang.php create mode 100755 lang/lv/lang.php create mode 100755 lang/mg/lang.php create mode 100755 lang/mk/lang.php create mode 100755 lang/mr/lang.php create mode 100755 lang/ne/lang.php create mode 100755 lang/nl/lang.php create mode 100755 lang/no/lang.php create mode 100755 lang/pl/lang.php create mode 100755 lang/pt-br/lang.php create mode 100755 lang/pt/lang.php create mode 100755 lang/ro/lang.php create mode 100755 lang/ru/lang.php create mode 100755 lang/sk/lang.php create mode 100755 lang/sl/lang.php create mode 100755 lang/sq/lang.php create mode 100755 lang/sr/lang.php create mode 100755 lang/sv/lang.php create mode 100755 lang/th/lang.php create mode 100755 lang/tr/lang.php create mode 100755 lang/uk/lang.php create mode 100755 lang/vi/lang.php create mode 100755 lang/zh-tw/lang.php create mode 100755 lang/zh/lang.php create mode 100755 main.php create mode 100755 mediamanager.php create mode 100755 style.ini create mode 100755 tpl_functions.php diff --git a/README b/README new file mode 100755 index 000000000..966fc45f1 --- /dev/null +++ b/README @@ -0,0 +1,5 @@ +Starter Template for DokuWiki +http://www.dokuwiki.org/template:starter + +version: 2011-02-20 +author: Anika Henke diff --git a/conf/default.php b/conf/default.php new file mode 100755 index 000000000..57b7bd581 --- /dev/null +++ b/conf/default.php @@ -0,0 +1,11 @@ + + */ + +html { + overflow-x: auto; + overflow-y: scroll; +} +html, body { + background-color: __background__; + color: __text__; + margin: 0; + padding: 0; +} +body { + font: normal 100%/1.4 Frutiger, "Frutiger Linotype", Univers, Calibri, Myriad, "Liberation Sans", Tahoma, Geneva, "Helvetica Neue", Helvetica, Arial, sans-serif; + /* default font size: 100% => 16px; 93.75% => 15px; 87.5% => 14px; 81.25% => 13px; 75% => 12px */ +} + + +/*____________ headers ____________*/ + +h1, h2, h3, h4, h5, h6, +caption, legend { + font-family: Constantia, Utopia, Lucidabright, Lucida, Georgia, serif; + font-weight: bold; + color: __text_neu__; + background-color: inherit; + padding: 0; + clear: left; /* ideally 'both', but problems with toc */ +} + +h1 { font-size: 2.25em; margin: 0 0 0.444em; } +h2 { font-size: 1.5em; margin: 0 0 0.666em; } +h3 { font-size: 1.125em; margin: 0 0 0.888em; } +h4 { font-size: 1em; margin: 0 0 1.0em; } +h5 { font-size: .875em; margin: 0 0 1.1428em; } +h6 { font-size: .75em; margin: 0 0 1.333em; } +/* bottom margin = 1 / font-size */ + + +/*____________ basic margins and paddings ____________*/ + +p, ul, ol, dl, pre, table, +hr, blockquote, fieldset, address { + margin: 0 0 1.4em 0; /* bottom margin = line-height */ + padding: 0; +} + +div { + margin: 0; + padding: 0; +} + +p, dt, dd, td, th, li { +} + + +/*____________ lists ____________*/ + +ul, ol { + padding: 0 0 0 1.5em; +} +li, dd { + padding: 0; + margin: 0 0 0 1.5em; +} +dt { + font-weight: bold; + margin: 0; + padding: 0; +} + +li ul, li ol, li dl, +dl ul, dl ol, dl dl { + margin-bottom: 0; + padding: 0; +} +li li { + font-size: 100%; +} + +ul { list-style: disc outside; } +ol { list-style: decimal outside; } +ol ol { list-style-type: lower-alpha; } +ol ol ol { list-style-type: upper-roman; } +ol ol ol ol { list-style-type: upper-alpha; } +ol ol ol ol ol { list-style-type: lower-roman; } + + +/*____________ tables ____________*/ + +table { + border-collapse: collapse; + empty-cells: show; + border-spacing: 0; + border: 1px solid __border__; +} + +caption { + caption-side: top; + text-align: left; + margin: 0 0 .3em; +} + +th, td { + padding: .3em .5em; + margin: 0; + vertical-align: top; + border: 1px solid __border__; + text-align: left; +} +th { + font-weight: bold; + background-color: __background_alt__; +} + + +/*____________ links ____________*/ + +a { +} +a:link, a:visited { + text-decoration: none; + color: #00c; /* §colour */ +} +a:link:hover, a:visited:hover, +a:link:focus, a:visited:focus, +a:link:active, a:visited:active { + text-decoration: underline; +} +a:link:focus, a:visited:focus { + outline: 1px dotted; +} +a:link:active, a:visited:active { + color: #c00; /* §colour */ +} + + +/*____________ misc ____________*/ + +img { + border-width: 0; + vertical-align: middle; + color: #666; + background-color: transparent; + font-style: italic; +} + +hr { + border-style: solid; + border-width: 1px 0 0; + text-align: center; + height: 0; + width: 100%; + clear: both; +} + +acronym, abbr { + cursor: help; + border-bottom: 1px dotted; + font-style: normal; +} + +pre, code, samp, kbd { + font-family: Consolas, "Andale Mono WT", "Andale Mono", "Bitstream Vera Sans Mono", "Liberation Mono", Monaco, "Courier New", monospace; + /* same font stack should be used for ".dokuwiki table.diff td" in _diff.css */ + font-size: 1em; + direction: ltr; + text-align: left; +} +pre { + overflow: auto; +} + +blockquote { + padding: 0 1.25em; + border: solid __border__; + border-width: 0 0 0 .25em; +} +q:before, q:after { + content: ''; +} + +sub, sup { + font-size: .8em; + line-height: 1; +} +sub { + vertical-align: sub; +} +sup { + vertical-align: super; +} + +/*____________ forms ____________*/ + +form { + display: inline; + margin: 0; + padding: 0; +} +fieldset { + padding: 1em 1em 0; + border: 1px solid __text_alt__; +} +legend { + margin: 0; + padding: 0 .1em; +} +label { + vertical-align: middle; + cursor: pointer; +} +input, textarea, button, +select, optgroup, option { + font: inherit; + color: inherit; + /* background-color destroys button look */ + line-height: 1; + margin: 0; + vertical-align: middle; +} +input[type=text], input[type=password], textarea { + padding: .1em; +} +input[type=radio], input[type=checkbox], input.check { + padding: 0; +} +input[type=submit], input.button, button { + cursor: pointer; +} +input[disabled], button[disabled], +input[readonly], button[readonly] { + cursor: auto; +} +optgroup { font-style: italic; font-weight: bold; } +option { font-style: normal; font-weight: normal; } + + +/*____________ general classes ____________*/ + +div.clearer { + /* additional to what's already in lib/styles/style.css: */ + font-size: 1px; + visibility: hidden; +} + +.a11y { + position: absolute; + left: -9000px; + top: -4000px; + width: 0; + height: 0; + overflow: hidden; + display: inline; +} diff --git a/css/content.css b/css/content.css new file mode 100755 index 000000000..57c313d6c --- /dev/null +++ b/css/content.css @@ -0,0 +1,102 @@ +/** + * This file provides the main design styles for the page content. + * + * @author Anika Henke + * @author Andreas Gohr + */ + + +/*____________ section indenting ____________ + +.dokuwiki.page h1 {margin-left: 0;} +.dokuwiki.page h2 {margin-left: .666em;} +.dokuwiki.page h3 {margin-left: 1.776em;} +.dokuwiki.page h4 {margin-left: 3em;} +.dokuwiki.page h5 {margin-left: 4.5712em;} +.dokuwiki.page div.level1 {margin-left: 0;} +.dokuwiki.page div.level2 {margin-left: 1em;} +.dokuwiki.page div.level3 {margin-left: 2em;} +.dokuwiki.page div.level4 {margin-left: 3em;} +.dokuwiki.page div.level5 {margin-left: 4em;} +*/ +/* hx margin-left = (1 / font-size) * .levelx-margin */ + + +/*____________ images ____________*/ + +/* embedded images (styles are already partly set in lib/styles/style.css) */ +.dokuwiki img.media { } +.dokuwiki img.medialeft { margin: .5em 1.5em .5em 0; } +.dokuwiki img.mediaright { margin: .5em 0 .5em 1.5em; } +.dokuwiki img.mediacenter { margin: .5em auto; } + + +/*____________ tables ____________*/ + +.dokuwiki table.inline { + min-width: 50%; +} +.dokuwiki table.inline th, +.dokuwiki table.inline td { + border: 1px solid __text_alt__; +} +.dokuwiki table.inline th { + color: inherit; + background-color: __background_neu__; +} +.dokuwiki table.inline td { +} +.dokuwiki table.inline tr:hover td { + background-color: __background_alt__; +} +.dokuwiki table.inline tr:hover th { + background-color: __border__; +} + + +/*____________ code ____________*/ + +.dokuwiki pre, +.dokuwiki tt, +.dokuwiki code, +.dokuwiki samp, +.dokuwiki kbd { + background-color: __background_alt__; + color: inherit; +} +/* fix if background-color hides underlining */ +.dokuwiki em.u code { + text-decoration: underline; +} +.dokuwiki pre { + border: 1px solid __border__; + padding: 0 .2em; +} +/* for code in */ +.dokuwiki pre.file { +} + +/* filenames for downloadable file and code blocks */ +.dokuwiki dl.code, +.dokuwiki dl.file { +} + +.dokuwiki dl.code dt, +.dokuwiki dl.file dt { + background-color: __background_alt__; + border: solid __border__; + border-width: 1px 1px 0; + color: inherit; + display: inline; + padding: 0 .5em; + margin-left: 1em; +} +.dokuwiki dl.code dt a, +.dokuwiki dl.file dt a { +} + +.dokuwiki dl.code dd, +.dokuwiki dl.file dd { + margin: 0; +} + diff --git a/css/default.css b/css/default.css new file mode 100644 index 000000000..813f16cce --- /dev/null +++ b/css/default.css @@ -0,0 +1,241 @@ +body{ + font: 0.875em/1.4 'Helvetica Neue', sans-serif; +} + +h1, h2, h3, h4, h5{ + font-family: 'Helvetica Neue', sans-serif; + font-weight: normal; + color: black; +} + +h1{ + font-size: 2em; + letter-spacing: -0.035em; +} + +h1{ + /*2 lines below makes ascenders of h1 be at the top of block*/ + line-height: 0.75em; + padding-bottom: 0.3em; +} + +table{ + border: none; +} + +a:link{ + color: #06d; +} + +a:visited{ + color: #2E5E94; + border-bottom: 1px dotted #09d; +} + +.button{ + background-color: #eee; + background: -moz-linear-gradient(top, #ffffff 0%, #f4f4f4 30%, #eeeeee 99%, #cccccc 99%); + background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#ffffff), color-stop(30%,#f4f4f4), color-stop(99%,#eeeeee), color-stop(99%,#cccccc)); + background: -webkit-linear-gradient(top, #ffffff 0%,#f4f4f4 30%,#eeeeee 99%,#cccccc 99%); + background: -o-linear-gradient(top, #ffffff 0%,#f4f4f4 30%,#eeeeee 99%,#cccccc 99%); + background: -ms-linear-gradient(top, #ffffff 0%,#f4f4f4 30%,#eeeeee 99%,#cccccc 99%); + filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#ffffff', endColorstr='#cccccc',GradientType=0 ); + background: linear-gradient(top, #ffffff 0%,#f4f4f4 30%,#eeeeee 99%,#cccccc 99%); + border: 1px solid #ccc; +} + +.dokuwiki pre{ + border-left: none; + border-right: none; + padding: 0.75em 1em; +} + +#dokuwiki__site{ + width: 770px +} + +#dokuwiki__header{ + margin-top: 4em; + margin-bottom: 3em; +} + +#dokuwiki__header .tools{ + text-align: left; +} + +#dokuwiki__header .tools, +#dokuwiki__header .headings{ + margin-bottom: 1em; +} + +#dokuwiki__header h1 a{ + color: black; +} + +#dokuwiki__header .claim{ + color: #888; + font-style: italic; + font-size: 0.875em; +} + +#dokuwiki__header form.search{ + margin-top: 0; + font-size: 0.875em; +} + +div.breadcrumbs{ + border: 1px solid #ccc; + border-left: 0; + border-right: 0; + border-bottom: 0; + padding: 0.2em 0 0.75em 0; + margin-bottom: 0.6em; + font-size: 0.875em; +} + +div.breadcrumbs .bcsep{ + font-size: 0.75em; +} + +.mode_show #dokuwiki__content{ + float: left; + width: 750px; +} + +.mode_show #dokuwiki__aside{ + border-top: 1px solid #ccc; + float: right; + width: 220px; + font-size: 0.87em; +} + +#dokuwiki__usertools, +#dokuwiki__pagetools{ + padding: 10px; + padding-left: 0; + padding-right: 0; + background: #eee; + border: none; +} + +#dokuwiki__usertools{ + z-index: 1; + background: #edf1f2; + background: -moz-linear-gradient(top, #edf1f2 0%, #eaeaea 88%, #dbdfe0 100%); + background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#edf1f2), color-stop(88%,#eaeaea), color-stop(100%,#dbdfe0)); + background: -webkit-linear-gradient(top, #edf1f2 0%,#eaeaea 88%,#dbdfe0 100%); + background: -o-linear-gradient(top, #edf1f2 0%,#eaeaea 88%,#dbdfe0 100%); + background: -ms-linear-gradient(top, #edf1f2 0%,#eaeaea 88%,#dbdfe0 100%); + filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#edf1f2', endColorstr='#dbdfe0',GradientType=0 ); + background: linear-gradient(top, #edf1f2 0%,#eaeaea 88%,#dbdfe0 100%); +} + +#dokuwiki__pagetools{ + background: #dbdfe0; + background: -moz-linear-gradient(top, #dbdfe0 0%, #eaeaea 12%, #edf1f2 100%); + background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#dbdfe0), color-stop(12%,#eaeaea), color-stop(100%,#edf1f2)); + background: -webkit-linear-gradient(top, #dbdfe0 0%,#eaeaea 12%,#edf1f2 100%); + background: -o-linear-gradient(top, #dbdfe0 0%,#eaeaea 12%,#edf1f2 100%); + background: -ms-linear-gradient(top, #dbdfe0 0%,#eaeaea 12%,#edf1f2 100%); + filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#dbdfe0', endColorstr='#edf1f2',GradientType=0 ); + background: linear-gradient(top, #dbdfe0 0%,#eaeaea 12%,#edf1f2 100%); +} + +#dokuwiki__sitetools{ + width: 220px; +} + +#dokuwiki__sitetools ul, +#dokuwiki__usertools ul, +#dokuwiki__pagetools ul{ + max-width: 800px; + font-size: 0.875em; + padding-left: 0; +} + +#dokuwiki__sitetools li, +#dokuwiki__usertools li, +#dokuwiki__pagetools li{ + margin-left: 0; + margin-right: 1em; +} + +#dokuwiki__sitetools ul{ + margin-top: 0.5em; +} + +#dokuwiki__header form.search #qsearch__in{ + border: 1px solid #ccc; + border-right: none; + padding: 0.41em 0; + margin-right: 0; + -webkit-border-bottom-left-radius: 2px; + -webkit-border-top-left-radius: 2px; + -moz-border-radius-bottomleft: 2px; + -moz-border-radius-topleft: 2px; + border-bottom-left-radius: 2px; + border-top-left-radius: 2px; + -moz-box-shadow:inset 0 0 1px #eee; + -webkit-box-shadow:inset 0 0 1px #eee; + box-shadow:inset 0 0 1px #eee; +} + +#dokuwiki__sitetools .button{ + border: 1px solid #ddd; + -webkit-border-bottom-right-radius: 2px; + -webkit-border-top-right-radius: 2px; + -moz-border-radius-bottomright: 2px; + -moz-border-radius-topright: 2px; + border-bottom-right-radius: 2px; + border-top-right-radius: 2px; + padding: 0.5em 0.75em; +} + +#dokuwiki__pagetools a, +#dokuwiki__usertools a{ +} + +#dokuwiki__pagetools a.wikilink1, +#dokuwiki__pagetools a.wikilink2, +#dokuwiki__usertools a.wikilink1, +#dokuwiki__usertools a.wikilink2{ + color: #06d; +} + +.dokuwiki div.toc{ + font-size: 0.875em; + line-height: 1.5em; + width: 220px; + margin-bottom: 0.5em; + margin-left: 20px; + margin-top: -0.3em; +} + +.dokuwiki div.tocheader{ + padding: 0.5em 1em; +} + +.dokuwiki #toc__inside{ + padding: 0.75em 1em 1.5em; +} + +.dokuwiki .secedit{ + float: none; + margin: 0 0 1.4em 0; + text-align: right; +} + +.dokuwiki div.secedit{ +} + +.dokuwiki .secedit input.button{ + -webkit-border-bottom-right-radius: 4px; + -webkit-border-bottom-left-radius: 4px; + -moz-border-radius-bottomright: 4px; + -moz-border-radius-bottomleft: 4px; + border-bottom-right-radius: 4px; + border-bottom-left-radius: 4px; + border-radius: 2px; + padding: 0.5em 0.9em; + color: #555; +} diff --git a/css/design.css b/css/design.css new file mode 100755 index 000000000..cfed4f078 --- /dev/null +++ b/css/design.css @@ -0,0 +1,253 @@ +/** + * This file provides the main design styles for the + * bits that surround the content. + * + * @author Anika Henke + * @author Andreas Gohr + */ + + +/* header +********************************************************************/ + +#dokuwiki__header { + margin: 1em 0 0; +} +#IE7 #dokuwiki__header { + margin-top: 2em; +} + +#dokuwiki__header .headings { + margin-bottom: 2.1em; +} +#dokuwiki__header h1 { + margin-bottom: 0; + font-size: 1.5em; +} +#dokuwiki__header h1 a { + text-decoration: none; + color: #00c; + background-color: inherit; +} +#dokuwiki__header p.claim { + margin-bottom: 0; +} +#dokuwiki__header h2 { + margin-bottom: 0; + font-size: 1.125em; +} + +#dokuwiki__header .tools { + margin-bottom: 2.1em; +} +#dokuwiki__header .tools ul { + margin-bottom: 0; +} +#dokuwiki__header .tools ul li { + display: inline; +} + +#dokuwiki__header form.search { + margin: .5em 0 0; + display: block; +} +#dokuwiki__header form.search #qsearch__in { + width: 12em; + margin-right: .5em; +} + +#dokuwiki__header div.breadcrumbs { + margin-bottom: .3em; +} +#dokuwiki__header div.breadcrumbs a { + color: __existing__; + background-color: inherit; +} + + +/* tools +********************************************************************/ + +/* make wiki links look the same as tool links in tool bars */ +#dokuwiki__usertools a.wikilink1, +#dokuwiki__pagetools a.wikilink1, +#dokuwiki__usertools a.wikilink2, +#dokuwiki__pagetools a.wikilink2 { + color: #00c; + border-bottom-width: 0; +} +#dokuwiki__usertools a.wikilink2:hover, +#dokuwiki__pagetools a.wikilink2:hover, +#dokuwiki__usertools a.wikilink2:active, +#dokuwiki__pagetools a.wikilink2:active, +#dokuwiki__usertools a.wikilink2:focus, +#dokuwiki__pagetools a.wikilink2:focus { + text-decoration: underline; +} + +/* highlight selected tool */ +.mode_admin a.action.admin, +.mode_login a.action.login, +.mode_register a.action.register, +.mode_profile a.action.profile, +.mode_recent a.action.recent, +.mode_index a.action.index, +.mode_revisions a.action.revs, +.mode_backlink a.action.backlink, +.mode_subscribe a.action.subscribe { + font-weight: bold; +} + +/*____________ user tools ____________*/ + +#dokuwiki__usertools { + position: absolute; + top: 0; + right: 0; + border-bottom: 1px solid __border__; + background-color: __background_alt__; + width: 100%; +} +#dokuwiki__usertools ul, +#dokuwiki__pagetools ul { + /* imitate #dokuwiki__site */ + margin: 0 auto; + max-width: 64em; + padding: 0 1em; +} +#IE6 #dokuwiki__usertools ul { + width: 100%; +} +#dokuwiki__usertools ul li.user { + float: left; + margin-left: 0; +} + +/*____________ page tools ____________*/ + +#dokuwiki__pagetools { + position: fixed; + bottom: 0; + left: 0; + border-top: 1px solid __border__; + background-color: __background_alt__; + width: 100%; + z-index: 10; +} +#IE6 #dokuwiki__content { + margin-bottom: 1.4em; +} +#dokuwiki__pagetools ul li { + display: inline; + margin: 0 1.5em 0 0; +} +#dokuwiki__pagetools ul li a.action.top { + float: right; +} +#IE6 #dokuwiki__pagetools ul, +#IE7 #dokuwiki__pagetools ul { + position: relative; +} +#IE6 #dokuwiki__pagetools ul li a.action.top, +#IE7 #dokuwiki__pagetools ul li a.action.top { + position: absolute; + top: 0; + right: 0; +} + + +/* sidebar +********************************************************************/ + +#dokuwiki__aside { + padding-top: .4em; + line-height: 1.2; +} + +/* make sidebar more condensed */ + +#dokuwiki__aside h1 { margin-bottom: .222em; } +#dokuwiki__aside h2 { margin-bottom: .333em; } +#dokuwiki__aside h3 { margin-bottom: .444em; } +#dokuwiki__aside h4 { margin-bottom: .5em; } +#dokuwiki__aside h5 { margin-bottom: .5714em; } + +#dokuwiki__aside p, #dokuwiki__aside ul, #dokuwiki__aside ol, #dokuwiki__aside dl, +#dokuwiki__aside pre, #dokuwiki__aside table, #dokuwiki__aside fieldset, +#dokuwiki__aside hr, #dokuwiki__aside blockquote, #dokuwiki__aside address { + margin-bottom: .7em; +} + +#dokuwiki__aside ul, #dokuwiki__aside ol { + padding-left: 0; +} +#dokuwiki__aside li ul, #dokuwiki__aside li ol { + margin-bottom: 0; +} + + +/* content +********************************************************************/ + +.dokuwiki .page { +} + +/*____________ misc ____________*/ + +/* license note in footer and under edit window */ +.dokuwiki div.license { + font-size: 93.75%; +} + +#IE6 .dokuwiki input.button, #IE6 .dokuwiki button, +#IE7 .dokuwiki input.button, #IE7 .dokuwiki button { + line-height: 1.4; +} + +/*____________ JS popup ____________*/ + +.JSpopup { + background-color: __background__; + color: __text__; + border: 1px solid __border__; + line-height: 1.2; + padding: 0 .2em; +} + +.JSpopup ul, +.JSpopup ol { + padding-left: 0; +} + + +/* footer +********************************************************************/ + +.dokuwiki .wrapper { + margin-bottom: 2.8em; +} +#IE6 .dokuwiki .wrapper { + margin-bottom: 1.4em; +} + +#dokuwiki__footer { + margin-bottom: 1em; +} +#IE6 #dokuwiki__footer, +#IE7 #dokuwiki__footer { + height: 1%; +} +#dokuwiki__footer .doc { + float: left; +} +#dokuwiki__footer .top { + float: right; +} +#dokuwiki__footer .license { + clear: both; +} +#dokuwiki__footer .license img { + margin: 0 .5em 0 0; + float: none; +} + diff --git a/css/includes.css b/css/includes.css new file mode 100755 index 000000000..bc189962f --- /dev/null +++ b/css/includes.css @@ -0,0 +1,4 @@ +/** + * This file provides styles for included seperate html files + * (added through "include hooks"). + */ diff --git a/css/print.css b/css/print.css new file mode 100755 index 000000000..9171bc9ae --- /dev/null +++ b/css/print.css @@ -0,0 +1,123 @@ +/** + * This file provides the styles for printing. + * + * @todo: improve and finish + */ + +body { + /* + font: normal 12pt/1.2 serif; + color: #000; + background-color: #fff; + */ +} + +/* hide certain sections */ +.a11y, +div.notify, div.info, div.success, div.error, +#dokuwiki__header .tools, #dokuwiki__aside, +.dokuwiki .breadcrumbs, .dokuwiki .toc, .dokuwiki .secedit, +#dokuwiki__pagetools, #dokuwiki__footer { + display: none; +} + +.dokuwiki h1, .dokuwiki h2, .dokuwiki h3, .dokuwiki h4, .dokuwiki h5, +.dokuwiki caption, .dokuwiki legend { + clear: both; +} +.dokuwiki ul { list-style: disc outside; } +.dokuwiki ol { list-style: decimal outside; } +.dokuwiki ol ol { list-style-type: lower-alpha; } +.dokuwiki ol ol ol { list-style-type: upper-roman; } +.dokuwiki ol ol ol ol { list-style-type: upper-alpha; } +.dokuwiki ol ol ol ol ol { list-style-type: lower-roman; } + +/* undo icons */ +.dokuwiki a:link, .dokuwiki a:visited { + text-decoration: underline; + color: #333; + background-color: inherit; + background-image: none; + padding: 0; +} + +/* display href after link */ +a.urlextern:after, +a.interwiki:after, +a.mail:after { + content: " [" attr(href) "]"; + font-size: 90%; +} + +/* code blocks */ +.dokuwiki pre { + font-family: monospace; +} +.dokuwiki dl.code dt, .dokuwiki dl.file dt { + font-weight: bold; +} + +/* images */ +.dokuwiki img { border-width: 0; vertical-align: middle; } +.dokuwiki img.medialeft { margin: .5em 1.5em .5em 0; float: left; } +.dokuwiki img.mediaright { margin: .5em 0 .5em 1.5em; float: right; } +.dokuwiki img.mediacenter { margin: .5em auto; display: block; } + +/* align table cells */ +.dokuwiki .leftalign { text-align: left; } +.dokuwiki .centeralign { text-align: center; } +.dokuwiki .rightalign { text-align: right; } + +/* underline */ +.dokuwiki em.u { font-style: normal; text-decoration: underline; } +.dokuwiki em em.u { font-style: italic; } + +div.clearer { + clear: both; + line-height: 0; + height: 0; + overflow: hidden; +} + +.dokuwiki blockquote { + padding: 0 10pt; + margin: 0; + border: solid #ccc; + border-width: 0 0 0 2pt; +} + +/* tables */ +.dokuwiki table { + border-collapse: collapse; + empty-cells: show; + border-spacing: 0; + border: 1pt solid #ccc; +} +.dokuwiki th, .dokuwiki td { + padding: 3pt 5pt; + margin: 0; + vertical-align: top; + border: 1pt solid #666; + text-align: left; +} +.dokuwiki th { + font-weight: bold; +} + + +/*____________ a bit of layout ____________*/ + +#dokuwiki__header { + border-bottom: 2pt solid #ccc; +} +#dokuwiki__header h1 { + font-size: 1.5em; +} +#dokuwiki__header h1 a { + text-decoration: none; +} +.dokuwiki div.footnotes { + clear: both; + border-top: 1pt solid #000; + margin-top: 10pt; +} diff --git a/css/rtl.css b/css/rtl.css new file mode 100755 index 000000000..8b82a45e1 --- /dev/null +++ b/css/rtl.css @@ -0,0 +1,309 @@ +/** + * This file provides layout and design corrections for right-to-left + * languages. + * + * @author Anika Henke + */ + +/*____________ basic ____________*/ + +caption, +td, +th { + text-align: right; +} + +ul, ol { + padding: 0 1.5em 0 0; +} +li, dd { + margin: 0 1.5em 0 0; +} +blockquote { + border-width: 0 .25em 0 0; +} + +h1, h2, h3, h4, h5, h6, +caption, legend { + clear: right; +} + +.a11y { + left: auto; + right: -9000px; +} + +/*____________ structure ____________*/ + +#dokuwiki__header .headings { + float: right; +} +#dokuwiki__header .tools { + float: left; + text-align: left; +} + +.mode_show #dokuwiki__aside { + float: right; +} +#dokuwiki__aside .pad { + margin: 0 0 0 1.5em; +} + +.mode_show #dokuwiki__content { + float: left; + margin-left: 0; + margin-right: -__sidebar_width__; +} +.mode_show #dokuwiki__content .pad { + margin-left: 0; + margin-right: __sidebar_width__; +} + +/*____________ design ____________*/ + +#dokuwiki__header form.search #qsearch__in { + margin-right: 0; + margin-left: .5em; +} + +#dokuwiki__usertools ul li.user { + float: right; + margin-right: 0; +} +#dokuwiki__pagetools ul li a.action.top { + float: left; +} + +#dokuwiki__aside ul, #dokuwiki__aside ol { + padding-right: 0; +} + +/*____________ content ____________*/ + +/* section indenting +.dokuwiki .page h1 {margin-left: 0; margin-right: 0;} +.dokuwiki .page h2 {margin-left: 0; margin-right: .666em;} +.dokuwiki .page h3 {margin-left: 0; margin-right: 1.776em;} +.dokuwiki .page h4 {margin-left: 0; margin-right: 3em;} +.dokuwiki .page h5 {margin-left: 0; margin-right: 4.5712em;} +.dokuwiki .page div.level1 {margin-left: 0; margin-right: 0;} +.dokuwiki .page div.level2 {margin-left: 0; margin-right: 1em;} +.dokuwiki .page div.level3 {margin-left: 0; margin-right: 2em;} +.dokuwiki .page div.level4 {margin-left: 0; margin-right: 3em;} +.dokuwiki .page div.level5 {margin-left: 0; margin-right: 4em;} +*/ + +.dokuwiki dl.code dt, +.dokuwiki dl.file dt { + margin-left: 0; + margin-right: 1em; +} + +.JSpopup ul, +.JSpopup ol { + padding-right: 0; +} + + +/*____________ _imgdetail ____________*/ + +#dokuwiki__detail div.content img { + float: right; + margin-right: 0; + margin-left: 1.5em; +} +#dokuwiki__detail div.content div.img_detail { + float: right +} + + +/*____________ _mediamanager ____________*/ + +#mediamgr__aside { + left: auto; + right: 0; + border-right-width: 0; + border-left: 1px solid __border__; +} +#mediamgr__content { + right: auto; + left: 0; +} + +#media__opts input { + margin-right: 0; + margin-left: .3em; +} + +#media__tree ul { + padding-left: 0; + padding-right: .2em; +} +#media__tree ul li { + clear: right; + margin-right: 0; +} +#media__tree ul li img { + float: right; + padding: .5em 0 0 .3em; +} +#media__tree ul li li { + margin-left: 0; + margin-right: 1.5em; +} + +#media__content a.mediafile { + margin-right: 0; + margin-left: 1.5em; +} +#media__content div.detail div.thumb { + float: right; + margin: 0 18px 0 .5em; +} +#media__content form.meta div.metafield { + clear: right; +} +#media__content form.meta label { + float: right; + clear: right; +} +#media__content form.meta .edit { + float: right; +} +#media__content form.meta div.buttons { + clear: right; + margin: .2em 25% 0 0; +} + + +/*____________ _links ____________*/ + +/* if link icons don't work as expected, remove the following lines */ +.dokuwiki a.urlextern, +.dokuwiki a.windows, +.dokuwiki a.mail, +.dokuwiki a.interwiki, +.dokuwiki a.mediafile { + background-position: right center; + padding: 0 17px 0 0; +} + + +/*____________ _toc ____________*/ + +.dokuwiki div.toc { + float: left; + margin: 0 1.4em 1.4em 0; +} +.dokuwiki .toc span.toc_open, +.dokuwiki .toc span.toc_close { + float: left; + margin: 0 0 0 .2em; +} +.dokuwiki #toc__inside ul ul { + padding-left: 0; + padding-right: 1em; +} +.dokuwiki ul.idx { + padding-right: 0; +} + + +/*____________ _footnotes ____________*/ + + +/*____________ _search ____________*/ + +.dokuwiki div.search_quickresult ul li { + float: right; +} +.dokuwiki form.search div.ajax_qsearch { + left: auto; + right: -13.5em; + text-align: right; +} + + +/*____________ _recent ____________*/ + +.dokuwiki #dw__recent ul li, +.dokuwiki #page__revisions ul li { + margin-right: 0; +} + + +/*____________ _diff ____________*/ + + +/*____________ _edit ____________*/ + +.dokuwiki div.toolbar #draft__status { + float: left; +} +.dokuwiki #wiki__editbar #size__ctl { + float: left; +} +.dokuwiki #wiki__editbar #size__ctl img { + cursor: pointer; +} +.dokuwiki #wiki__editbar .editButtons { + margin-right: 0; + margin-left: 1em; +} + +.dokuwiki .secedit { + float: left; +} + + +/*____________ _modal ____________*/ + +#link__wiz_close { + float: left; +} +#link__wiz_result { + text-align: right; +} +#link__wiz_result div.type_u, +#link__wiz_result div.type_f, +#link__wiz_result div.type_d { + padding: 3px 22px 3px 3px; + background-position: 257px 3px; +} + + +/*____________ _forms ____________*/ + +.dokuwiki label.block { + text-align: left; +} +.dokuwiki label.simple { + text-align: right; +} + +form#subscribe__form fieldset { + text-align: right; +} + + +/*____________ _admin ____________*/ + +.dokuwiki ul.admin_tasks { + float: right; +} +.dokuwiki ul.admin_tasks li { + padding-left: 0; + padding-right: 35px; + background-position: right 0; +} + +.dokuwiki #admin__version { + clear: right; + float: left; +} + + +/*____________ includes ____________*/ + + diff --git a/css/structure.css b/css/structure.css new file mode 100755 index 000000000..14490a0b0 --- /dev/null +++ b/css/structure.css @@ -0,0 +1,72 @@ +/** + * This file provides styles for the general layout structure. + * + * @author Anika Henke + */ + +body { + margin: 0 auto; +} +#dokuwiki__site { + margin: 0 auto; + max-width: 64em; + padding: 1.4em 1em; +} +#dokuwiki__site .site { +} + +#dokuwiki__header { +} +#dokuwiki__header .pad { +} + #dokuwiki__header .headings { + float: left; + } + #IE6 #dokuwiki__header .headings { + width: 50%; + } + #dokuwiki__header .tools { + float: right; + text-align: right; + } + #IE6 #dokuwiki__header .tools { + width: 50%; + } + +#dokuwiki__site .wrapper { + position: relative; +} +#IE6 #dokuwiki__site .wrapper, +#IE7 #dokuwiki__site .wrapper { + height: 1%; +} + + /* show sidebar only in show mode */ + #dokuwiki__aside { + display: none; + } + .mode_show #dokuwiki__aside { + width: __sidebar_width__; + float: left; + position: relative; + display: block; + } + #dokuwiki__aside .pad { + margin: 0 1.5em 0 0; + } + + /* make content wider when there's no sidebar */ + .mode_show #dokuwiki__content { + float: right; + margin-left: -__sidebar_width__; + width: 100%; + } + .mode_show #dokuwiki__content .pad { + margin-left: __sidebar_width__; + } + +#dokuwiki__footer { + clear: both; +} +#dokuwiki__footer .pad { +} diff --git a/detail.php b/detail.php new file mode 100755 index 000000000..500890114 --- /dev/null +++ b/detail.php @@ -0,0 +1,81 @@ + + * @author Anika Henke + */ + +// 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'])?>] + + + + + + + +
+ + + + +

+ +
+ + +
+

+ +
+ '.$lang['img_date'].':
'.dformat($t).'
'; + + $t = tpl_img_getTag('File.Name'); + if($t) print '
'.$lang['img_fname'].':
'.hsc($t).'
'; + + $t = tpl_img_getTag(array('Iptc.Byline','Exif.TIFFArtist','Exif.Artist','Iptc.Credit')); + if($t) print '
'.$lang['img_artist'].':
'.hsc($t).'
'; + + $t = tpl_img_getTag(array('Iptc.CopyrightNotice','Exif.TIFFCopyright','Exif.Copyright')); + if($t) print '
'.$lang['img_copyr'].':
'.hsc($t).'
'; + + $t = tpl_img_getTag('File.Format'); + if($t) print '
'.$lang['img_format'].':
'.hsc($t).'
'; + + $t = tpl_img_getTag('File.NiceSize'); + if($t) print '
'.$lang['img_fsize'].':
'.hsc($t).'
'; + + $t = tpl_img_getTag('Simple.Camera'); + if($t) print '
'.$lang['img_camera'].':
'.hsc($t).'
'; + + $t = tpl_img_getTag(array('IPTC.Keywords','IPTC.Category','xmp.dc:subject')); + if($t) print '
'.$lang['img_keywords'].':
'.hsc($t).'
'; + + ?> +
+ +
+
+
+ +

←

+ + +
+ + + + diff --git a/images/bullet.png b/images/bullet.png new file mode 100755 index 000000000..da87696c7 Binary files /dev/null and b/images/bullet.png differ diff --git a/images/closed.png b/images/closed.png new file mode 100755 index 000000000..3691ebc17 Binary files /dev/null and b/images/closed.png differ diff --git a/images/favicon.ico b/images/favicon.ico new file mode 100755 index 000000000..8b9616abb Binary files /dev/null and b/images/favicon.ico differ diff --git a/images/link_icon.gif b/images/link_icon.gif new file mode 100755 index 000000000..815ccb1b1 Binary files /dev/null and b/images/link_icon.gif differ diff --git a/images/mail_icon.gif b/images/mail_icon.gif new file mode 100755 index 000000000..50a87a9a0 Binary files /dev/null and b/images/mail_icon.gif differ diff --git a/images/open.png b/images/open.png new file mode 100755 index 000000000..eafb64ed3 Binary files /dev/null and b/images/open.png differ diff --git a/images/windows.gif b/images/windows.gif new file mode 100755 index 000000000..4f12acce1 Binary files /dev/null and b/images/windows.gif differ diff --git a/lang/af/lang.php b/lang/af/lang.php new file mode 100755 index 000000000..127ac3076 --- /dev/null +++ b/lang/af/lang.php @@ -0,0 +1,12 @@ + + */ + +if (!defined('DOKU_INC')) die(); /* must be run from within DokuWiki */ +@require_once(dirname(__FILE__).'/tpl_functions.php'); /* include hook for template functions */ + +$showTools = !tpl_getConf('hideTools') || ( tpl_getConf('hideTools') && $_SERVER['REMOTE_USER'] ); +?> + + + + <?php tpl_pagetitle() ?> [<?php echo strip_tags($conf['title']) ?>] + + + + + + + + + + + are added to make it possible to e.g. style a page differently if it's in edit mode, + see http://www.dokuwiki.org/devel:action_modes for a list of action modes */ ?> + +
+ + + + +
+ +
+

+ ','id="dokuwiki__top" accesskey="h" title="[H]"') */ ?> + +

+ + +
    +
    • +
+
+
+ +
+ + +
+

+
    + would be: tpl_action('edit',0,'li') */ + if ($_SERVER['REMOTE_USER']) { + echo '
  • '; + tpl_userinfo(); /* 'Logged in as ...' */ + echo '
    • '; + } + tpl_action('admin', 1, 'li'); + _tpl_action('userpage', 1, 'li'); + tpl_action('profile', 1, 'li'); + _tpl_action('register', 1, 'li'); /* DW versions > 2011-02-20 can use the core function tpl_action('register', 1, 'li') */ + tpl_action('login', 1, 'li'); + ?> +
+
+ + + +
+

+ +
    + +
+
+ +
+
+ +
+
+
+ + +
+ + +
+ + + +
+ + + +
+ + +
+ + + + + +
+
+ + + +
+ + +
+ +
+
+ +
+
+ + + +
+

+
    + +
+
+ +
+ + +
+
+ +
+ + +
+ +
+ + + diff --git a/mediamanager.php b/mediamanager.php new file mode 100755 index 000000000..0f4362577 --- /dev/null +++ b/mediamanager.php @@ -0,0 +1,40 @@ + + */ +?> + + + + + <?php echo hsc($lang['mediaselect'])?> + [<?php echo strip_tags($conf['title'])?>] + + + + + + + +
+ +
+

+ + +
+ + +
+ +
+ +
+
+ + + diff --git a/style.ini b/style.ini new file mode 100755 index 000000000..ef5e0201e --- /dev/null +++ b/style.ini @@ -0,0 +1,64 @@ +; Please see http://www.php.net/manual/en/function.parse-ini-file.php +; for limitations of the ini format used here + +; 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] + +css/basic.css = screen +css/structure.css = screen +css/design.css = screen +css/content.css = screen +css/_imgdetail.css = screen +css/_mediamanager.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/includes.css = screen + +css/rtl.css = rtl +css/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__ = "#333" +__background__ = "#fff" +; alternative text and background colors +__text_alt__ = "#999" +__background_alt__ = "#eee" +; neutral text and background colors +__text_neu__ = "#666" +__background_neu__ = "#ddd" +; border color +__border__ = "#ccc" + +;-------------------------------------------------------------------------- + +; these are used for links +__existing__ = "#090" +__missing__ = "#f30" + +; highlighting search snippets +__highlight__ = "#ff9" + +; sidebar width +__sidebar_width__ = "16em" diff --git a/tpl_functions.php b/tpl_functions.php new file mode 100755 index 000000000..54b143fc9 --- /dev/null +++ b/tpl_functions.php @@ -0,0 +1,139 @@ + + */ +function _tpl_discussion($discussionPage,$title,$backTitle,$link=0,$wrapper=0) { + global $ID; + + $discussPage = str_replace('@ID@',$ID,$discussionPage); + $discussPageRaw = str_replace('@ID@','',$discussionPage); + $isDiscussPage = strpos($ID,$discussPageRaw)!==false; + $backID = str_replace($discussPageRaw,'',$ID); + + if ($wrapper) echo "<$wrapper>"; + + if ($isDiscussPage) { + if ($link) + tpl_pagelink($backID,$backTitle); + else + echo html_btn('back2article',$backID,'',array(),'get',0,$backTitle); + } else { + if ($link) + tpl_pagelink($discussPage,$title); + else + echo html_btn('discussion',$discussPage,'',array(),'get',0,$title); + } + + if ($wrapper) echo ""; +} + +/** + * Create link/button to user page + * + * @author Anika Henke + */ +function _tpl_userpage($userPage,$title,$link=0,$wrapper=0) { + if (!$_SERVER['REMOTE_USER']) return; + + global $conf; + $userPage = str_replace('@USER@',$_SERVER['REMOTE_USER'],$userPage); + + if ($wrapper) echo "<$wrapper>"; + + if ($link) + tpl_pagelink($userPage,$title); + else + echo html_btn('userpage',$userPage,'',array(),'get',0,$title); + + if ($wrapper) echo ""; +} + +/** + * Create link/button to register page + * 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 + * + * @author Anika Henke + */ +function _tpl_action($type,$link=0,$wrapper=0) { + switch ($type) { + case 'discussion': + if (tpl_getConf('discussionPage')) { + _tpl_discussion(tpl_getConf('discussionPage'),tpl_getLang('discussion'),tpl_getLang('back_to_article'),$link,$wrapper); + } + break; + case 'userpage': + if (tpl_getConf('userPage')) { + _tpl_userpage(tpl_getConf('userPage'),tpl_getLang('userpage'),$link,$wrapper); + } + break; + case 'register': + _tpl_register($link,$wrapper); + break; + } +} + +/** + * Use favicon.ico from data/media root directory if it exists, otherwise use + * the one in the template's image directory. + * DW versions > 2010-11-12 can use the core function tpl_getFavicon() + * + * @author Anika Henke + */ +function _tpl_getFavicon() { + if (file_exists(mediaFN('favicon.ico'))) + return ml('favicon.ico'); + return DOKU_TPL.'images/favicon.ico'; +} + +/** + * Include additional html file from conf directory if it exists, otherwise use + * file in the template's root directory. + * + * @author Anika Henke + */ +function _tpl_include($fn) { + $confFile = DOKU_CONF.$fn; + $tplFile = dirname(__FILE__).'/'.$fn; + + if (file_exists($confFile)) + include($confFile); + else if (file_exists($tplFile)) + include($tplFile); +} -- cgit v1.2.3 From 6520918f9b2790608d06ce24d8b0af36f8704707 Mon Sep 17 00:00:00 2001 From: Cla Date: Thu, 11 Aug 2011 23:44:35 +0100 Subject: applied css in style.ini instead of hacking a link tag into the head --- main.php | 1 - style.ini | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/main.php b/main.php index ae0a38e2b..76844b428 100755 --- a/main.php +++ b/main.php @@ -20,7 +20,6 @@ $showTools = !tpl_getConf('hideTools') || ( tpl_getConf('hideTools') && $_SERVER - diff --git a/style.ini b/style.ini index ef5e0201e..426fd9be4 100755 --- a/style.ini +++ b/style.ini @@ -25,6 +25,7 @@ css/_modal.css = screen css/_forms.css = screen css/_admin.css = screen css/includes.css = screen +css/default.css = screen css/rtl.css = rtl css/print.css = print -- cgit v1.2.3 From 6cd05b1039bcbf7e83420f44e2150e1beb4aca10 Mon Sep 17 00:00:00 2001 From: Cla Date: Wed, 17 Aug 2011 22:32:44 +0100 Subject: made some changes in response to feed back. CSS getting messy, might hand it back to pro at this point ;) --- css/default.css | 36 ++++++++++++++++++++++++++---------- 1 file changed, 26 insertions(+), 10 deletions(-) diff --git a/css/default.css b/css/default.css index 813f16cce..00a732740 100644 --- a/css/default.css +++ b/css/default.css @@ -3,7 +3,7 @@ body{ } h1, h2, h3, h4, h5{ - font-family: 'Helvetica Neue', sans-serif; + font-family: 'Lucida Grande', 'Arial', sans-serif; font-weight: normal; color: black; } @@ -51,7 +51,8 @@ a:visited{ } #dokuwiki__site{ - width: 770px + max-width: 1024px; + padding: 1.4em 20px; /* don't like mixing units, but with max-width set in px, I don't have another solution? */ } #dokuwiki__header{ @@ -83,7 +84,7 @@ a:visited{ font-size: 0.875em; } -div.breadcrumbs{ +.wrapper div.breadcrumbs{ border: 1px solid #ccc; border-left: 0; border-right: 0; @@ -98,13 +99,17 @@ div.breadcrumbs .bcsep{ } .mode_show #dokuwiki__content{ - float: left; - width: 750px; + float: right; + width: 99%; /* 99% of what? */ +} + +.mode_show #dokuwiki__content h1{ + line-height: 1.175em; } .mode_show #dokuwiki__aside{ border-top: 1px solid #ccc; - float: right; + float: left; width: 220px; font-size: 0.87em; } @@ -119,6 +124,7 @@ div.breadcrumbs .bcsep{ } #dokuwiki__usertools{ + padding: 10px 0; z-index: 1; background: #edf1f2; background: -moz-linear-gradient(top, #edf1f2 0%, #eaeaea 88%, #dbdfe0 100%); @@ -130,6 +136,11 @@ div.breadcrumbs .bcsep{ background: linear-gradient(top, #edf1f2 0%,#eaeaea 88%,#dbdfe0 100%); } +.wrapper #dokuwiki__pagetools ul, /* making a mess :P */ +.tools #dokuwiki__usertools ul{ + padding: 0 20px; +} + #dokuwiki__pagetools{ background: #dbdfe0; background: -moz-linear-gradient(top, #dbdfe0 0%, #eaeaea 12%, #edf1f2 100%); @@ -148,7 +159,7 @@ div.breadcrumbs .bcsep{ #dokuwiki__sitetools ul, #dokuwiki__usertools ul, #dokuwiki__pagetools ul{ - max-width: 800px; + max-width: 1004px; font-size: 0.875em; padding-left: 0; } @@ -203,9 +214,9 @@ div.breadcrumbs .bcsep{ } .dokuwiki div.toc{ - font-size: 0.875em; - line-height: 1.5em; - width: 220px; + font-size: 0.75em; + line-height: 1.4em; + width: 200px; margin-bottom: 0.5em; margin-left: 20px; margin-top: -0.3em; @@ -219,6 +230,11 @@ div.breadcrumbs .bcsep{ padding: 0.75em 1em 1.5em; } +.dokuwiki #toc__inside ul li{ + list-style: disc; + margin-left: 1.5em; +} + .dokuwiki .secedit{ float: none; margin: 0 0 1.4em 0; -- cgit v1.2.3 From 75462285106c5ff642922f9b2bb4922deac3d9a2 Mon Sep 17 00:00:00 2001 From: Cla Date: Sat, 20 Aug 2011 13:41:13 +0100 Subject: change font to Arial --- css/default.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/css/default.css b/css/default.css index 00a732740..3846251a8 100644 --- a/css/default.css +++ b/css/default.css @@ -1,9 +1,9 @@ body{ - font: 0.875em/1.4 'Helvetica Neue', sans-serif; + font: 0.875em/1.4 'Arial', sans-serif; } h1, h2, h3, h4, h5{ - font-family: 'Lucida Grande', 'Arial', sans-serif; + font-family: 'Arial', sans-serif; font-weight: normal; color: black; } -- cgit v1.2.3 From 6ab9f8659c49cfb82c99bd2ae0006fc7fe868981 Mon Sep 17 00:00:00 2001 From: Cla Date: Sun, 21 Aug 2011 02:08:59 +0100 Subject: redesigned header to make user tools look like buttons in preparation for icons coming in table borders now in line with button borders designed the download code tab made changed size of aside h1 (but not lower headings yet...) --- css/default.css | 136 ++++++++++++++++++++++++++++++++++++++++++++++++-------- main.php | 35 ++++++++------- 2 files changed, 137 insertions(+), 34 deletions(-) diff --git a/css/default.css b/css/default.css index 3846251a8..005a77918 100644 --- a/css/default.css +++ b/css/default.css @@ -45,8 +45,6 @@ a:visited{ } .dokuwiki pre{ - border-left: none; - border-right: none; padding: 0.75em 1em; } @@ -56,8 +54,25 @@ a:visited{ } #dokuwiki__header{ - margin-top: 4em; - margin-bottom: 3em; + padding-top: 2em; + padding-bottom: 2em; + background: #eee; +} + +#dokuwiki__header #dokuwiki__sitetools, +#dokuwiki__header .headings{ + z-index: 12; + position: relative; +} + +.header_background{ + background: #eee; + background: -webkit-linear-gradient(top, #eeeeee 98%,#dfdfdf 100%); + position: absolute; + top: 0; + height: 165px; + width: 100%; + z-index: 1; } #dokuwiki__header .tools{ @@ -69,6 +84,12 @@ a:visited{ margin-bottom: 1em; } +#dokuwiki__header h1 a{ + font-size: 1.5em; + font-weight: bold; + text-shadow: 1px 1px 0px #fff; +} + #dokuwiki__header h1 a{ color: black; } @@ -84,8 +105,12 @@ a:visited{ font-size: 0.875em; } +.wrapper{ + padding-top: 30px; +} + .wrapper div.breadcrumbs{ - border: 1px solid #ccc; + /*border: 1px solid #ccc;*/ border-left: 0; border-right: 0; border-bottom: 0; @@ -108,12 +133,23 @@ div.breadcrumbs .bcsep{ } .mode_show #dokuwiki__aside{ - border-top: 1px solid #ccc; + /*border-top: 1px solid #ccc;*/ float: left; width: 220px; font-size: 0.87em; + line-height: 1.5; +} + +.mode_show #dokuwiki__aside h1{ + font-size: 1.25em; + margin-top: 1.25em; +} + +.mode_show #dokuwiki__aside h1.sectionedit1{ + margin-top: 0; } + #dokuwiki__usertools, #dokuwiki__pagetools{ padding: 10px; @@ -124,16 +160,27 @@ div.breadcrumbs .bcsep{ } #dokuwiki__usertools{ - padding: 10px 0; - z-index: 1; - background: #edf1f2; - background: -moz-linear-gradient(top, #edf1f2 0%, #eaeaea 88%, #dbdfe0 100%); - background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#edf1f2), color-stop(88%,#eaeaea), color-stop(100%,#dbdfe0)); - background: -webkit-linear-gradient(top, #edf1f2 0%,#eaeaea 88%,#dbdfe0 100%); - background: -o-linear-gradient(top, #edf1f2 0%,#eaeaea 88%,#dbdfe0 100%); - background: -ms-linear-gradient(top, #edf1f2 0%,#eaeaea 88%,#dbdfe0 100%); - filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#edf1f2', endColorstr='#dbdfe0',GradientType=0 ); - background: linear-gradient(top, #edf1f2 0%,#eaeaea 88%,#dbdfe0 100%); + padding: 0; + z-index: 11; + background: transparent; +} + +#dokuwiki__usertools .inner{ + margin: 0 auto; + border-bottom-left-radius: 4px; + border-bottom-right-radius: 4px; + background: #ffffff; + background: -moz-linear-gradient(top, #ffffff 0%, #f2f2f2 100%); + background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#ffffff), color-stop(100%,#f2f2f2)); + background: -webkit-linear-gradient(top, #ffffff 0%,#f2f2f2 100%); + background: -o-linear-gradient(top, #ffffff 0%,#f2f2f2 100%); + background: -ms-linear-gradient(top, #ffffff 0%,#f2f2f2 100%); + filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#ffffff', endColorstr='#f2f2f2',GradientType=0 ); + background: linear-gradient(top, #ffffff 0%,#f2f2f2 100%); + width: 1004px; + padding: 10px; + border: 1px solid #ddd; + border-top: none; } .wrapper #dokuwiki__pagetools ul, /* making a mess :P */ @@ -167,8 +214,7 @@ div.breadcrumbs .bcsep{ #dokuwiki__sitetools li, #dokuwiki__usertools li, #dokuwiki__pagetools li{ - margin-left: 0; - margin-right: 1em; + margin-left: 1em; } #dokuwiki__sitetools ul{ @@ -191,6 +237,11 @@ div.breadcrumbs .bcsep{ box-shadow:inset 0 0 1px #eee; } +#dokuwiki__header #dokuwiki__sitetools ul, +#dokuwiki__header form.search{ + text-align: right; +} + #dokuwiki__sitetools .button{ border: 1px solid #ddd; -webkit-border-bottom-right-radius: 2px; @@ -255,3 +306,52 @@ div.breadcrumbs .bcsep{ padding: 0.5em 0.9em; color: #555; } + +.dokuwiki dl.code dt, .dokuwiki dl.file dt{ + padding: 5px 8px 2px; + border-top-left-radius: 4px; + border-top-right-radius: 4px; + border-bottom: 1px dashed #ccc; + background: -webkit-linear-gradient(top, #ffffff 0%,#eeeeee 100%); + margin-left: 0; +} + +.dokuwiki dl.code dt, .dokuwiki dl.file dt a{ + background-color: transparent; + padding: 0.2em 0 0.1em 1.6em; + font-size: 0.875em; + font-weight: normal; +} + +.dokuwiki table.inline th, .dokuwiki table.inline td{ + border: 1px solid #ccc; +} + +.dokuwiki table.inline th{ + background: #eee; +} + +.dokuwiki div.toolbar button.toolbutton{ + background: none; + background-color: #eee; + background: -moz-linear-gradient(top, #ffffff 0%, #f4f4f4 30%, #eeeeee 99%, #cccccc 99%); + background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#ffffff), color-stop(30%,#f4f4f4), color-stop(99%,#eeeeee), color-stop(99%,#cccccc)); + background: -webkit-linear-gradient(top, #ffffff 0%,#f4f4f4 30%,#eeeeee 99%,#cccccc 99%); + background: -o-linear-gradient(top, #ffffff 0%,#f4f4f4 30%,#eeeeee 99%,#cccccc 99%); + background: -ms-linear-gradient(top, #ffffff 0%,#f4f4f4 30%,#eeeeee 99%,#cccccc 99%); + filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#ffffff', endColorstr='#cccccc',GradientType=0 ); + background: linear-gradient(top, #ffffff 0%,#f4f4f4 30%,#eeeeee 99%,#cccccc 99%); + border: 1px solid #ccc; + border-right: none; +} + +.dokuwiki div.toolbar button.toolbutton:first-child{ + border-top-left-radius: 4px; + border-bottom-left-radius: 4px; +} + +.dokuwiki div.toolbar button.toolbutton:last-child{ + border-left: 1px solid #eee; + border-top-right-radius: 4px; + border-bottom-right-radius: 4px; +} diff --git a/main.php b/main.php index 76844b428..e230355a7 100755 --- a/main.php +++ b/main.php @@ -56,22 +56,24 @@ $showTools = !tpl_getConf('hideTools') || ( tpl_getConf('hideTools') && $_SERVER
-

-
    - would be: tpl_action('edit',0,'li') */ - if ($_SERVER['REMOTE_USER']) { - echo '
  • '; - tpl_userinfo(); /* 'Logged in as ...' */ - echo '
    • '; - } - tpl_action('admin', 1, 'li'); - _tpl_action('userpage', 1, 'li'); - tpl_action('profile', 1, 'li'); - _tpl_action('register', 1, 'li'); /* DW versions > 2011-02-20 can use the core function tpl_action('register', 1, 'li') */ - tpl_action('login', 1, 'li'); - ?> -
+
+

+
    + would be: tpl_action('edit',0,'li') */ + if ($_SERVER['REMOTE_USER']) { + echo '
  • '; + tpl_userinfo(); /* 'Logged in as ...' */ + echo '
    • '; + } + tpl_action('admin', 1, 'li'); + _tpl_action('userpage', 1, 'li'); + tpl_action('profile', 1, 'li'); + _tpl_action('register', 1, 'li'); /* DW versions > 2011-02-20 can use the core function tpl_action('register', 1, 'li') */ + tpl_action('login', 1, 'li'); + ?> +
+
@@ -161,5 +163,6 @@ $showTools = !tpl_getConf('hideTools') || ( tpl_getConf('hideTools') && $_SERVER
+
-- cgit v1.2.3 From 816f4362db471d31c28d1ad42ecce517a929fbe6 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Sun, 28 Aug 2011 19:12:33 +0100 Subject: removed starter template specific functionalities (including user and discussion buttons/links) --- conf/default.php | 2 - conf/metadata.php | 2 - lang/en/lang.php | 4 -- lang/en/settings.php | 2 - main.php | 6 +-- tpl_functions.php | 111 --------------------------------------------------- 6 files changed, 2 insertions(+), 125 deletions(-) diff --git a/conf/default.php b/conf/default.php index 57b7bd581..378e61909 100755 --- a/conf/default.php +++ b/conf/default.php @@ -5,7 +5,5 @@ */ $conf['tagline'] = 'This is the tagline - explaining what this site is about.'; -$conf['discussionPage'] = 'discussion:@ID@'; -$conf['userPage'] = 'user:@USER@:'; $conf['sidebarID'] = 'sidebar'; $conf['hideTools'] = 0; diff --git a/conf/metadata.php b/conf/metadata.php index 88583bcd0..ac0fdf142 100755 --- a/conf/metadata.php +++ b/conf/metadata.php @@ -5,7 +5,5 @@ */ $meta['tagline'] = array('string'); -$meta['discussionPage'] = array('string'); -$meta['userPage'] = array('string'); $meta['sidebarID'] = array('string'); $meta['hideTools'] = array('onoff'); diff --git a/lang/en/lang.php b/lang/en/lang.php index 91b04b177..a19601ef9 100755 --- a/lang/en/lang.php +++ b/lang/en/lang.php @@ -4,10 +4,6 @@ * */ -$lang['discussion'] = 'Discussion'; -$lang['back_to_article'] = 'Back to article'; -$lang['userpage'] = 'User page'; - /* accessibility headlines */ $lang['user_tools'] = 'User Tools'; $lang['site_tools'] = 'Site Tools'; diff --git a/lang/en/settings.php b/lang/en/settings.php index 356e95234..da01d290f 100755 --- a/lang/en/settings.php +++ b/lang/en/settings.php @@ -5,7 +5,5 @@ */ $lang['tagline'] = 'Tagline'; -$lang['discussionPage'] = 'Discussion page (leave empty to disable discussions)'; -$lang['userPage'] = 'User page (leave empty to disable user pages)'; $lang['sidebarID'] = 'page name of page included in sidebar'; $lang['hideTools'] = 'Hide tools when not logged in?'; diff --git a/main.php b/main.php index e230355a7..428a2f122 100755 --- a/main.php +++ b/main.php @@ -18,7 +18,7 @@ $showTools = !tpl_getConf('hideTools') || ( tpl_getConf('hideTools') && $_SERVER <?php tpl_pagetitle() ?> [<?php echo strip_tags($conf['title']) ?>] - + @@ -67,9 +67,8 @@ $showTools = !tpl_getConf('hideTools') || ( tpl_getConf('hideTools') && $_SERVER echo ''; } tpl_action('admin', 1, 'li'); - _tpl_action('userpage', 1, 'li'); tpl_action('profile', 1, 'li'); - _tpl_action('register', 1, 'li'); /* DW versions > 2011-02-20 can use the core function tpl_action('register', 1, 'li') */ + tpl_action('register', 1, 'li'); tpl_action('login', 1, 'li'); ?> @@ -140,7 +139,6 @@ $showTools = !tpl_getConf('hideTools') || ( tpl_getConf('hideTools') && $_SERVER
    - */ -function _tpl_discussion($discussionPage,$title,$backTitle,$link=0,$wrapper=0) { - global $ID; - - $discussPage = str_replace('@ID@',$ID,$discussionPage); - $discussPageRaw = str_replace('@ID@','',$discussionPage); - $isDiscussPage = strpos($ID,$discussPageRaw)!==false; - $backID = str_replace($discussPageRaw,'',$ID); - - if ($wrapper) echo "<$wrapper>"; - - if ($isDiscussPage) { - if ($link) - tpl_pagelink($backID,$backTitle); - else - echo html_btn('back2article',$backID,'',array(),'get',0,$backTitle); - } else { - if ($link) - tpl_pagelink($discussPage,$title); - else - echo html_btn('discussion',$discussPage,'',array(),'get',0,$title); - } - - if ($wrapper) echo ""; -} - -/** - * Create link/button to user page - * - * @author Anika Henke - */ -function _tpl_userpage($userPage,$title,$link=0,$wrapper=0) { - if (!$_SERVER['REMOTE_USER']) return; - - global $conf; - $userPage = str_replace('@USER@',$_SERVER['REMOTE_USER'],$userPage); - - if ($wrapper) echo "<$wrapper>"; - - if ($link) - tpl_pagelink($userPage,$title); - else - echo html_btn('userpage',$userPage,'',array(),'get',0,$title); - - if ($wrapper) echo ""; -} - -/** - * Create link/button to register page - * 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 - * - * @author Anika Henke - */ -function _tpl_action($type,$link=0,$wrapper=0) { - switch ($type) { - case 'discussion': - if (tpl_getConf('discussionPage')) { - _tpl_discussion(tpl_getConf('discussionPage'),tpl_getLang('discussion'),tpl_getLang('back_to_article'),$link,$wrapper); - } - break; - case 'userpage': - if (tpl_getConf('userPage')) { - _tpl_userpage(tpl_getConf('userPage'),tpl_getLang('userpage'),$link,$wrapper); - } - break; - case 'register': - _tpl_register($link,$wrapper); - break; - } -} - -/** - * Use favicon.ico from data/media root directory if it exists, otherwise use - * the one in the template's image directory. - * DW versions > 2010-11-12 can use the core function tpl_getFavicon() - * - * @author Anika Henke - */ -function _tpl_getFavicon() { - if (file_exists(mediaFN('favicon.ico'))) - return ml('favicon.ico'); - return DOKU_TPL.'images/favicon.ico'; -} - /** * Include additional html file from conf directory if it exists, otherwise use * file in the template's root directory. -- cgit v1.2.3 From edb1239b12e661f71fda343716448857681cbe53 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Sun, 28 Aug 2011 23:44:13 +0100 Subject: put new styles into their respective files and changed small bits --- css/_toc.css | 16 ++- css/basic.css | 45 +++++++- css/content.css | 29 +++-- css/default.css | 332 ++---------------------------------------------------- css/design.css | 207 +++++++++++++++++++++++----------- css/structure.css | 12 +- main.php | 34 +++--- style.ini | 6 +- 8 files changed, 252 insertions(+), 429 deletions(-) diff --git a/css/_toc.css b/css/_toc.css index fcccf4fc1..5bff9f648 100755 --- a/css/_toc.css +++ b/css/_toc.css @@ -9,14 +9,18 @@ /* toc container */ .dokuwiki div.toc { float: right; - margin: 0 0 1.4em 1.4em; - width: 12em; + margin: -0.3em 0 .5em 1.4em; + /* @todo: possible to make calculation sort of automatic? */ + width: 200px; /* __sidebar_width__ - margin-left */ + margin-left: 20px; + /*width: 12em;*/ + font-size: 0.75em; } /*____________ toc header ____________*/ .dokuwiki div.tocheader { - padding: .2em .5em; + padding: 0.5em 1em; margin-bottom: .2em; font-weight: bold; background-color: __background_alt__; @@ -47,16 +51,16 @@ /*____________ toc list ____________*/ .dokuwiki #toc__inside { - padding: .2em .5em; + padding: 0.75em 1em 1.5em; background-color: __background_alt__; color: __text__; } .dokuwiki #toc__inside ul { - padding: 0; + padding: 0 0 0 1.5em; margin: 0; } .dokuwiki #toc__inside ul li { - list-style: none; + list-style: disc; padding: 0; margin: 0; } diff --git a/css/basic.css b/css/basic.css index ef209d54a..fc0b99efc 100755 --- a/css/basic.css +++ b/css/basic.css @@ -19,7 +19,7 @@ html, body { padding: 0; } body { - font: normal 100%/1.4 Frutiger, "Frutiger Linotype", Univers, Calibri, Myriad, "Liberation Sans", Tahoma, Geneva, "Helvetica Neue", Helvetica, Arial, sans-serif; + font: normal 87.5%/1.4 Arial, sans-serif; /* default font size: 100% => 16px; 93.75% => 15px; 87.5% => 14px; 81.25% => 13px; 75% => 12px */ } @@ -28,15 +28,22 @@ body { h1, h2, h3, h4, h5, h6, caption, legend { - font-family: Constantia, Utopia, Lucidabright, Lucida, Georgia, serif; - font-weight: bold; - color: __text_neu__; + font-family: Arial, sans-serif; + font-weight: normal; + color: #000;/* @todo: style.ini */ background-color: inherit; padding: 0; clear: left; /* ideally 'both', but problems with toc */ } -h1 { font-size: 2.25em; margin: 0 0 0.444em; } +h1 { + font-size: 2em; + margin: 0 0 0.444em; + letter-spacing: -0.035em; + /*2 lines below makes ascenders of h1 be at the top of block*/ + line-height: 0.75; + padding-bottom: 0.3em; +} h2 { font-size: 1.5em; margin: 0 0 0.666em; } h3 { font-size: 1.125em; margin: 0 0 0.888em; } h4 { font-size: 1em; margin: 0 0 1.0em; } @@ -243,6 +250,34 @@ input[readonly], button[readonly] { optgroup { font-style: italic; font-weight: bold; } option { font-style: normal; font-weight: normal; } +/* @todo: either make input.edit and buttons more generic or put into design.css */ +.dokuwiki input.edit { + border: 1px solid __border__; + padding: 0.41em 0; + -moz-box-shadow: inset 0 0 1px __background_alt__; + -webkit-box-shadow: inset 0 0 1px __background_alt__; + box-shadow: inset 0 0 1px __background_alt__; + border-radius: 2px; + vertical-align: middle; +} +.dokuwiki input.button, +.dokuwiki button.button, +.dokuwiki div.toolbar button.toolbutton { + /* @todo: make style.ini colours any sense here? */ + vertical-align: middle; + color: inherit; + background-color: #eee; + background: -moz-linear-gradient(top, #ffffff 0%, #f4f4f4 30%, #eeeeee 99%, #cccccc 99%); + background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#ffffff), color-stop(30%,#f4f4f4), color-stop(99%,#eeeeee), color-stop(99%,#cccccc)); + background: -webkit-linear-gradient(top, #ffffff 0%,#f4f4f4 30%,#eeeeee 99%,#cccccc 99%); + background: -o-linear-gradient(top, #ffffff 0%,#f4f4f4 30%,#eeeeee 99%,#cccccc 99%); + background: -ms-linear-gradient(top, #ffffff 0%,#f4f4f4 30%,#eeeeee 99%,#cccccc 99%); + filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#ffffff', endColorstr='#cccccc',GradientType=0 ); + background: linear-gradient(top, #ffffff 0%,#f4f4f4 30%,#eeeeee 99%,#cccccc 99%); + border: 1px solid #ccc; + border-radius: 2px; +} + /*____________ general classes ____________*/ diff --git a/css/content.css b/css/content.css index 57c313d6c..60b1d6771 100755 --- a/css/content.css +++ b/css/content.css @@ -3,6 +3,7 @@ * * @author Anika Henke * @author Andreas Gohr + * @author Clarence Lee */ @@ -35,14 +36,15 @@ .dokuwiki table.inline { min-width: 50%; + border-width: 0; } .dokuwiki table.inline th, .dokuwiki table.inline td { - border: 1px solid __text_alt__; + border: 1px solid __border__; } .dokuwiki table.inline th { color: inherit; - background-color: __background_neu__; + background-color: __background_alt__; } .dokuwiki table.inline td { } @@ -70,7 +72,7 @@ } .dokuwiki pre { border: 1px solid __border__; - padding: 0 .2em; + padding: .75em 1em; } /* for code in */ .dokuwiki pre.file { @@ -84,19 +86,28 @@ .dokuwiki dl.code dt, .dokuwiki dl.file dt { background-color: __background_alt__; - border: solid __border__; - border-width: 1px 1px 0; + /* @todo: add gradients for other browsers */ + background: -webkit-linear-gradient(top, __background__ 0%, __background_alt__ 100%); color: inherit; - display: inline; - padding: 0 .5em; - margin-left: 1em; + border: 1px solid __border__; + border-bottom-color: __background_alt__; + border-top-left-radius: .3em; + border-top-right-radius: .3em; + padding: .3em .6em .1em; + margin-bottom: -1px; + float: left; } .dokuwiki dl.code dt a, .dokuwiki dl.file dt a { + background-color: transparent; + /* @todo: those 19px should better be in exe/css.php for all media icons */ + padding: 0.2em 0 0.1em 19px; + font-size: 0.875em; + font-weight: normal; } - .dokuwiki dl.code dd, .dokuwiki dl.file dd { margin: 0; + clear: left; } diff --git a/css/default.css b/css/default.css index 005a77918..8d42d733b 100644 --- a/css/default.css +++ b/css/default.css @@ -1,132 +1,16 @@ -body{ - font: 0.875em/1.4 'Arial', sans-serif; -} - -h1, h2, h3, h4, h5{ - font-family: 'Arial', sans-serif; - font-weight: normal; - color: black; -} - -h1{ - font-size: 2em; - letter-spacing: -0.035em; -} - -h1{ - /*2 lines below makes ascenders of h1 be at the top of block*/ - line-height: 0.75em; - padding-bottom: 0.3em; -} -table{ - border: none; -} +/*____________ basic ____________*/ a:link{ color: #06d; } - a:visited{ color: #2E5E94; border-bottom: 1px dotted #09d; } -.button{ - background-color: #eee; - background: -moz-linear-gradient(top, #ffffff 0%, #f4f4f4 30%, #eeeeee 99%, #cccccc 99%); - background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#ffffff), color-stop(30%,#f4f4f4), color-stop(99%,#eeeeee), color-stop(99%,#cccccc)); - background: -webkit-linear-gradient(top, #ffffff 0%,#f4f4f4 30%,#eeeeee 99%,#cccccc 99%); - background: -o-linear-gradient(top, #ffffff 0%,#f4f4f4 30%,#eeeeee 99%,#cccccc 99%); - background: -ms-linear-gradient(top, #ffffff 0%,#f4f4f4 30%,#eeeeee 99%,#cccccc 99%); - filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#ffffff', endColorstr='#cccccc',GradientType=0 ); - background: linear-gradient(top, #ffffff 0%,#f4f4f4 30%,#eeeeee 99%,#cccccc 99%); - border: 1px solid #ccc; -} - -.dokuwiki pre{ - padding: 0.75em 1em; -} - -#dokuwiki__site{ - max-width: 1024px; - padding: 1.4em 20px; /* don't like mixing units, but with max-width set in px, I don't have another solution? */ -} - -#dokuwiki__header{ - padding-top: 2em; - padding-bottom: 2em; - background: #eee; -} - -#dokuwiki__header #dokuwiki__sitetools, -#dokuwiki__header .headings{ - z-index: 12; - position: relative; -} - -.header_background{ - background: #eee; - background: -webkit-linear-gradient(top, #eeeeee 98%,#dfdfdf 100%); - position: absolute; - top: 0; - height: 165px; - width: 100%; - z-index: 1; -} - -#dokuwiki__header .tools{ - text-align: left; -} - -#dokuwiki__header .tools, -#dokuwiki__header .headings{ - margin-bottom: 1em; -} - -#dokuwiki__header h1 a{ - font-size: 1.5em; - font-weight: bold; - text-shadow: 1px 1px 0px #fff; -} - -#dokuwiki__header h1 a{ - color: black; -} - -#dokuwiki__header .claim{ - color: #888; - font-style: italic; - font-size: 0.875em; -} - -#dokuwiki__header form.search{ - margin-top: 0; - font-size: 0.875em; -} -.wrapper{ - padding-top: 30px; -} - -.wrapper div.breadcrumbs{ - /*border: 1px solid #ccc;*/ - border-left: 0; - border-right: 0; - border-bottom: 0; - padding: 0.2em 0 0.75em 0; - margin-bottom: 0.6em; - font-size: 0.875em; -} - -div.breadcrumbs .bcsep{ - font-size: 0.75em; -} - -.mode_show #dokuwiki__content{ - float: right; - width: 99%; /* 99% of what? */ -} +/*____________ content ____________*/ .mode_show #dokuwiki__content h1{ line-height: 1.175em; @@ -134,9 +18,8 @@ div.breadcrumbs .bcsep{ .mode_show #dokuwiki__aside{ /*border-top: 1px solid #ccc;*/ - float: left; - width: 220px; font-size: 0.87em; + /* @todo: is 1.5 intentional? shouldn't it be less? */ line-height: 1.5; } @@ -150,208 +33,17 @@ div.breadcrumbs .bcsep{ } -#dokuwiki__usertools, -#dokuwiki__pagetools{ - padding: 10px; - padding-left: 0; - padding-right: 0; - background: #eee; - border: none; -} +/*____________ _edit ____________*/ -#dokuwiki__usertools{ - padding: 0; - z-index: 11; - background: transparent; +.dokuwiki .secedit { + float: none; + margin: 0 0 1.4em 0; + text-align: right; } - -#dokuwiki__usertools .inner{ - margin: 0 auto; - border-bottom-left-radius: 4px; - border-bottom-right-radius: 4px; - background: #ffffff; - background: -moz-linear-gradient(top, #ffffff 0%, #f2f2f2 100%); - background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#ffffff), color-stop(100%,#f2f2f2)); - background: -webkit-linear-gradient(top, #ffffff 0%,#f2f2f2 100%); - background: -o-linear-gradient(top, #ffffff 0%,#f2f2f2 100%); - background: -ms-linear-gradient(top, #ffffff 0%,#f2f2f2 100%); - filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#ffffff', endColorstr='#f2f2f2',GradientType=0 ); - background: linear-gradient(top, #ffffff 0%,#f2f2f2 100%); - width: 1004px; - padding: 10px; - border: 1px solid #ddd; - border-top: none; +.dokuwiki div.secedit { } - -.wrapper #dokuwiki__pagetools ul, /* making a mess :P */ -.tools #dokuwiki__usertools ul{ - padding: 0 20px; +.dokuwiki .secedit input.button { + padding: 0.5em 0.9em; + color: #555; } -#dokuwiki__pagetools{ - background: #dbdfe0; - background: -moz-linear-gradient(top, #dbdfe0 0%, #eaeaea 12%, #edf1f2 100%); - background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#dbdfe0), color-stop(12%,#eaeaea), color-stop(100%,#edf1f2)); - background: -webkit-linear-gradient(top, #dbdfe0 0%,#eaeaea 12%,#edf1f2 100%); - background: -o-linear-gradient(top, #dbdfe0 0%,#eaeaea 12%,#edf1f2 100%); - background: -ms-linear-gradient(top, #dbdfe0 0%,#eaeaea 12%,#edf1f2 100%); - filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#dbdfe0', endColorstr='#edf1f2',GradientType=0 ); - background: linear-gradient(top, #dbdfe0 0%,#eaeaea 12%,#edf1f2 100%); -} - -#dokuwiki__sitetools{ - width: 220px; -} - -#dokuwiki__sitetools ul, -#dokuwiki__usertools ul, -#dokuwiki__pagetools ul{ - max-width: 1004px; - font-size: 0.875em; - padding-left: 0; -} - -#dokuwiki__sitetools li, -#dokuwiki__usertools li, -#dokuwiki__pagetools li{ - margin-left: 1em; -} - -#dokuwiki__sitetools ul{ - margin-top: 0.5em; -} - -#dokuwiki__header form.search #qsearch__in{ - border: 1px solid #ccc; - border-right: none; - padding: 0.41em 0; - margin-right: 0; - -webkit-border-bottom-left-radius: 2px; - -webkit-border-top-left-radius: 2px; - -moz-border-radius-bottomleft: 2px; - -moz-border-radius-topleft: 2px; - border-bottom-left-radius: 2px; - border-top-left-radius: 2px; - -moz-box-shadow:inset 0 0 1px #eee; - -webkit-box-shadow:inset 0 0 1px #eee; - box-shadow:inset 0 0 1px #eee; -} - -#dokuwiki__header #dokuwiki__sitetools ul, -#dokuwiki__header form.search{ - text-align: right; -} - -#dokuwiki__sitetools .button{ - border: 1px solid #ddd; - -webkit-border-bottom-right-radius: 2px; - -webkit-border-top-right-radius: 2px; - -moz-border-radius-bottomright: 2px; - -moz-border-radius-topright: 2px; - border-bottom-right-radius: 2px; - border-top-right-radius: 2px; - padding: 0.5em 0.75em; -} - -#dokuwiki__pagetools a, -#dokuwiki__usertools a{ -} - -#dokuwiki__pagetools a.wikilink1, -#dokuwiki__pagetools a.wikilink2, -#dokuwiki__usertools a.wikilink1, -#dokuwiki__usertools a.wikilink2{ - color: #06d; -} - -.dokuwiki div.toc{ - font-size: 0.75em; - line-height: 1.4em; - width: 200px; - margin-bottom: 0.5em; - margin-left: 20px; - margin-top: -0.3em; -} - -.dokuwiki div.tocheader{ - padding: 0.5em 1em; -} - -.dokuwiki #toc__inside{ - padding: 0.75em 1em 1.5em; -} - -.dokuwiki #toc__inside ul li{ - list-style: disc; - margin-left: 1.5em; -} - -.dokuwiki .secedit{ - float: none; - margin: 0 0 1.4em 0; - text-align: right; -} - -.dokuwiki div.secedit{ -} - -.dokuwiki .secedit input.button{ - -webkit-border-bottom-right-radius: 4px; - -webkit-border-bottom-left-radius: 4px; - -moz-border-radius-bottomright: 4px; - -moz-border-radius-bottomleft: 4px; - border-bottom-right-radius: 4px; - border-bottom-left-radius: 4px; - border-radius: 2px; - padding: 0.5em 0.9em; - color: #555; -} - -.dokuwiki dl.code dt, .dokuwiki dl.file dt{ - padding: 5px 8px 2px; - border-top-left-radius: 4px; - border-top-right-radius: 4px; - border-bottom: 1px dashed #ccc; - background: -webkit-linear-gradient(top, #ffffff 0%,#eeeeee 100%); - margin-left: 0; -} - -.dokuwiki dl.code dt, .dokuwiki dl.file dt a{ - background-color: transparent; - padding: 0.2em 0 0.1em 1.6em; - font-size: 0.875em; - font-weight: normal; -} - -.dokuwiki table.inline th, .dokuwiki table.inline td{ - border: 1px solid #ccc; -} - -.dokuwiki table.inline th{ - background: #eee; -} - -.dokuwiki div.toolbar button.toolbutton{ - background: none; - background-color: #eee; - background: -moz-linear-gradient(top, #ffffff 0%, #f4f4f4 30%, #eeeeee 99%, #cccccc 99%); - background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#ffffff), color-stop(30%,#f4f4f4), color-stop(99%,#eeeeee), color-stop(99%,#cccccc)); - background: -webkit-linear-gradient(top, #ffffff 0%,#f4f4f4 30%,#eeeeee 99%,#cccccc 99%); - background: -o-linear-gradient(top, #ffffff 0%,#f4f4f4 30%,#eeeeee 99%,#cccccc 99%); - background: -ms-linear-gradient(top, #ffffff 0%,#f4f4f4 30%,#eeeeee 99%,#cccccc 99%); - filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#ffffff', endColorstr='#cccccc',GradientType=0 ); - background: linear-gradient(top, #ffffff 0%,#f4f4f4 30%,#eeeeee 99%,#cccccc 99%); - border: 1px solid #ccc; - border-right: none; -} - -.dokuwiki div.toolbar button.toolbutton:first-child{ - border-top-left-radius: 4px; - border-bottom-left-radius: 4px; -} - -.dokuwiki div.toolbar button.toolbutton:last-child{ - border-left: 1px solid #eee; - border-top-right-radius: 4px; - border-bottom-right-radius: 4px; -} diff --git a/css/design.css b/css/design.css index cfed4f078..751631afc 100755 --- a/css/design.css +++ b/css/design.css @@ -4,6 +4,7 @@ * * @author Anika Henke * @author Andreas Gohr + * @author Clarence Lee */ @@ -11,34 +12,42 @@ ********************************************************************/ #dokuwiki__header { - margin: 1em 0 0; + padding: 4em 0 2em; + background-color: __background_alt__; + /* @todo: add gradients for other browsers */ + background: -webkit-linear-gradient(top, __background_alt__ 98%, __background_neu__ 100%); } #IE7 #dokuwiki__header { - margin-top: 2em; +} +#dokuwiki__header .pad { + padding: 0 1em; /* @pad */ } #dokuwiki__header .headings { - margin-bottom: 2.1em; + margin-bottom: 1em; } #dokuwiki__header h1 { margin-bottom: 0; - font-size: 1.5em; + font-size: 2.25em; + font-weight: bold; + text-shadow: 1px 1px 0px #fff; } #dokuwiki__header h1 a { text-decoration: none; - color: #00c; + /* @todo: style.ini */ + color: #000; background-color: inherit; } #dokuwiki__header p.claim { margin-bottom: 0; -} -#dokuwiki__header h2 { - margin-bottom: 0; - font-size: 1.125em; + /* @todo: style.ini */ + color: #888; + font-style: italic; + font-size: 0.875em; } #dokuwiki__header .tools { - margin-bottom: 2.1em; + margin-bottom: 1em; } #dokuwiki__header .tools ul { margin-bottom: 0; @@ -47,44 +56,10 @@ display: inline; } -#dokuwiki__header form.search { - margin: .5em 0 0; - display: block; -} -#dokuwiki__header form.search #qsearch__in { - width: 12em; - margin-right: .5em; -} - -#dokuwiki__header div.breadcrumbs { - margin-bottom: .3em; -} -#dokuwiki__header div.breadcrumbs a { - color: __existing__; - background-color: inherit; -} - /* tools ********************************************************************/ -/* make wiki links look the same as tool links in tool bars */ -#dokuwiki__usertools a.wikilink1, -#dokuwiki__pagetools a.wikilink1, -#dokuwiki__usertools a.wikilink2, -#dokuwiki__pagetools a.wikilink2 { - color: #00c; - border-bottom-width: 0; -} -#dokuwiki__usertools a.wikilink2:hover, -#dokuwiki__pagetools a.wikilink2:hover, -#dokuwiki__usertools a.wikilink2:active, -#dokuwiki__pagetools a.wikilink2:active, -#dokuwiki__usertools a.wikilink2:focus, -#dokuwiki__pagetools a.wikilink2:focus { - text-decoration: underline; -} - /* highlight selected tool */ .mode_admin a.action.admin, .mode_login a.action.login, @@ -98,29 +73,62 @@ font-weight: bold; } +#dokuwiki__usertools ul, +#dokuwiki__sitetools ul, +#dokuwiki__pagetools ul { + padding-left: 0; +} +#dokuwiki__usertools ul li, +#dokuwiki__sitetools ul li, +#dokuwiki__pagetools ul li { + font-size: 0.875em; + margin-left: 1em; +} +#dokuwiki__usertools ul li, +#dokuwiki__pagetools ul li { + margin-top: .7em; + margin-bottom: .7em; + float: left; + list-style: none; +} + /*____________ user tools ____________*/ #dokuwiki__usertools { position: absolute; top: 0; - right: 0; - border-bottom: 1px solid __border__; - background-color: __background_alt__; + left: 0; + text-align: left; width: 100%; } -#dokuwiki__usertools ul, -#dokuwiki__pagetools ul { - /* imitate #dokuwiki__site */ +#dokuwiki__usertools ul { + /* @todo: style.ini colours for gradients? */ + background-color: __background__; + background: -moz-linear-gradient(top, #ffffff 0%, #f2f2f2 100%); + background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#ffffff), color-stop(100%,#f2f2f2)); + background: -webkit-linear-gradient(top, #ffffff 0%,#f2f2f2 100%); + background: -o-linear-gradient(top, #ffffff 0%,#f2f2f2 100%); + background: -ms-linear-gradient(top, #ffffff 0%,#f2f2f2 100%); + filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#ffffff', endColorstr='#f2f2f2',GradientType=0 ); + background: linear-gradient(top, #ffffff 0%,#f2f2f2 100%); + border: solid __background_neu__; + border-width: 0 1px 1px; + border-bottom-left-radius: .3em; + border-bottom-right-radius: .3em; margin: 0 auto; - max-width: 64em; - padding: 0 1em; + padding: 0; + max-width: __site_width__; + overflow: hidden; } #IE6 #dokuwiki__usertools ul { width: 100%; } -#dokuwiki__usertools ul li.user { +#dokuwiki__usertools ul li { + margin: .7em 0 .7em 1em; float: left; - margin-left: 0; + list-style: none; +} +#dokuwiki__usertools ul li.user { } /*____________ page tools ____________*/ @@ -129,32 +137,68 @@ position: fixed; bottom: 0; left: 0; - border-top: 1px solid __border__; - background-color: __background_alt__; width: 100%; z-index: 10; + background: #dbdfe0; + background: -moz-linear-gradient(top, #dbdfe0 0%, #eaeaea 12%, #edf1f2 100%); + background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#dbdfe0), color-stop(12%,#eaeaea), color-stop(100%,#edf1f2)); + background: -webkit-linear-gradient(top, #dbdfe0 0%,#eaeaea 12%,#edf1f2 100%); + background: -o-linear-gradient(top, #dbdfe0 0%,#eaeaea 12%,#edf1f2 100%); + background: -ms-linear-gradient(top, #dbdfe0 0%,#eaeaea 12%,#edf1f2 100%); + filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#dbdfe0', endColorstr='#edf1f2',GradientType=0 ); + background: linear-gradient(top, #dbdfe0 0%,#eaeaea 12%,#edf1f2 100%); } #IE6 #dokuwiki__content { margin-bottom: 1.4em; } -#dokuwiki__pagetools ul li { - display: inline; - margin: 0 1.5em 0 0; +#dokuwiki__pagetools ul { + margin: 0 auto; + max-width: __site_width__; + padding: 0 1em; /* @pad */ } -#dokuwiki__pagetools ul li a.action.top { - float: right; +#dokuwiki__pagetools ul li { + margin: .7em 1em .7em 0; } -#IE6 #dokuwiki__pagetools ul, -#IE7 #dokuwiki__pagetools ul { +#dokuwiki__pagetools ul { position: relative; } -#IE6 #dokuwiki__pagetools ul li a.action.top, -#IE7 #dokuwiki__pagetools ul li a.action.top { +#dokuwiki__pagetools ul li a.action.top { position: absolute; - top: 0; + top: .7em; right: 0; } +/*____________ site tools ____________*/ + +#dokuwiki__sitetools { + /* @todo: is the width still needed? */ + width: __sidebar_width__; + text-align: right; +} + +#dokuwiki__sitetools form.search { + display: block; + font-size: 0.875em; +} +#dokuwiki__sitetools form.search input.edit { + /* @todo: em doesn't fit with px value for sitetools div */ + width: 12em; + border-right: none; + border-bottom-right-radius: 0; + border-top-right-radius: 0; +} +#dokuwiki__sitetools form.search input.button { + border-bottom-left-radius: 0; + border-top-left-radius: 0; + padding: 0.5em 0.75em; +} + +#dokuwiki__sitetools ul { + margin-top: 0.5em; +} +#dokuwiki__sitetools li { +} + /* sidebar ********************************************************************/ @@ -192,6 +236,23 @@ .dokuwiki .page { } +/*____________ breadcrumbs ____________*/ + +.dokuwiki div.breadcrumbs { + /*border-top: 1px solid #ccc;*/ + padding: 0.2em 0 0.75em 0; + margin-bottom: 0.6em; + font-size: 0.875em; +} +.dokuwiki div.breadcrumbs a { + /* @todo: wiki page colour or external link colour? */ + color: __existing__; + background-color: inherit; +} +.dokuwiki div.breadcrumbs .bcsep { + font-size: 0.75em; +} + /*____________ misc ____________*/ /* license note in footer and under edit window */ @@ -204,6 +265,20 @@ line-height: 1.4; } +.dokuwiki div.toolbar button.toolbutton { + border-radius: 0; + border-right-width: 0; +} +.dokuwiki div.toolbar button.toolbutton:first-child { + border-top-left-radius: 4px; + border-bottom-left-radius: 4px; +} +.dokuwiki div.toolbar button.toolbutton:last-child { + border-right-width: 1px; + border-top-right-radius: 4px; + border-bottom-right-radius: 4px; +} + /*____________ JS popup ____________*/ .JSpopup { diff --git a/css/structure.css b/css/structure.css index 14490a0b0..638d882b4 100755 --- a/css/structure.css +++ b/css/structure.css @@ -8,16 +8,16 @@ body { margin: 0 auto; } #dokuwiki__site { - margin: 0 auto; - max-width: 64em; - padding: 1.4em 1em; } #dokuwiki__site .site { } #dokuwiki__header { + width: 100%; } #dokuwiki__header .pad { + margin: 0 auto; + max-width: __site_width__; } #dokuwiki__header .headings { float: left; @@ -35,6 +35,9 @@ body { #dokuwiki__site .wrapper { position: relative; + margin: 0 auto; + max-width: __site_width__; + padding: 1.4em 1em; /* @pad */ } #IE6 #dokuwiki__site .wrapper, #IE7 #dokuwiki__site .wrapper { @@ -67,6 +70,9 @@ body { #dokuwiki__footer { clear: both; + margin: 0 auto; + max-width: __site_width__; + padding: 0 1em 2.4em; /* @pad */ } #dokuwiki__footer .pad { } diff --git a/main.php b/main.php index 428a2f122..e0f03d7d5 100755 --- a/main.php +++ b/main.php @@ -56,23 +56,21 @@ $showTools = !tpl_getConf('hideTools') || ( tpl_getConf('hideTools') && $_SERVER
    -
    -

    -
      - would be: tpl_action('edit',0,'li') */ - if ($_SERVER['REMOTE_USER']) { - echo '
    • '; - tpl_userinfo(); /* 'Logged in as ...' */ - echo '
      • '; - } - tpl_action('admin', 1, 'li'); - tpl_action('profile', 1, 'li'); - tpl_action('register', 1, 'li'); - tpl_action('login', 1, 'li'); - ?> -
    -
    +

    +
      + would be: tpl_action('edit',0,'li') */ + if ($_SERVER['REMOTE_USER']) { + echo '
    • '; + tpl_userinfo(); /* 'Logged in as ...' */ + echo '
      • '; + } + tpl_action('admin', 1, 'li'); + tpl_action('profile', 1, 'li'); + tpl_action('register', 1, 'li'); + tpl_action('login', 1, 'li'); + ?> +
    @@ -89,7 +87,6 @@ $showTools = !tpl_getConf('hideTools') || ( tpl_getConf('hideTools') && $_SERVER
-
@@ -161,6 +158,5 @@ $showTools = !tpl_getConf('hideTools') || ( tpl_getConf('hideTools') && $_SERVER
-
diff --git a/style.ini b/style.ini index 426fd9be4..0eeaf15d3 100755 --- a/style.ini +++ b/style.ini @@ -62,4 +62,8 @@ __missing__ = "#f30" __highlight__ = "#ff9" ; sidebar width -__sidebar_width__ = "16em" +; @todo: width in em or px? +;__site_width__ = "64em" +__site_width__ = "1000px" +;__sidebar_width__ = "16em" +__sidebar_width__ = "220px" -- cgit v1.2.3 From 1c2583d6e97f3220db6eb34b0cd5243369b5d41b Mon Sep 17 00:00:00 2001 From: Clarence Lee Date: Mon, 29 Aug 2011 16:45:15 +0100 Subject: small changes to the header --- css/default.css | 60 ++++++++++++++++++++++++++++++++++++++++++++------------- todo.txt | 20 +++++++++++++++++++ 2 files changed, 67 insertions(+), 13 deletions(-) create mode 100644 todo.txt diff --git a/css/default.css b/css/default.css index 005a77918..69bc59b26 100644 --- a/css/default.css +++ b/css/default.css @@ -1,5 +1,5 @@ body{ - font: 0.875em/1.4 'Arial', sans-serif; + font: 0.875em/1.45 'Arial', sans-serif; } h1, h2, h3, h4, h5{ @@ -54,9 +54,8 @@ a:visited{ } #dokuwiki__header{ - padding-top: 2em; - padding-bottom: 2em; - background: #eee; + padding-top: 1em; + padding-bottom: 1.4em; } #dokuwiki__header #dokuwiki__sitetools, @@ -67,10 +66,10 @@ a:visited{ .header_background{ background: #eee; - background: -webkit-linear-gradient(top, #eeeeee 98%,#dfdfdf 100%); + //background: #85AAE2; position: absolute; top: 0; - height: 165px; + height: 145px; width: 100%; z-index: 1; } @@ -85,7 +84,7 @@ a:visited{ } #dokuwiki__header h1 a{ - font-size: 1.5em; + font-size: 1.25em; font-weight: bold; text-shadow: 1px 1px 0px #fff; } @@ -114,8 +113,8 @@ a:visited{ border-left: 0; border-right: 0; border-bottom: 0; - padding: 0.2em 0 0.75em 0; - margin-bottom: 0.6em; + padding: 0.2em 0 0 0; + margin-bottom: 0.2em; font-size: 0.875em; } @@ -145,7 +144,7 @@ div.breadcrumbs .bcsep{ margin-top: 1.25em; } -.mode_show #dokuwiki__aside h1.sectionedit1{ +.mode_show #dokuwiki__aside h1:first-child{ margin-top: 0; } @@ -167,6 +166,10 @@ div.breadcrumbs .bcsep{ #dokuwiki__usertools .inner{ margin: 0 auto; + width: 1024px; +} + +#dokuwiki__usertools .inner ul{ border-bottom-left-radius: 4px; border-bottom-right-radius: 4px; background: #ffffff; @@ -177,10 +180,9 @@ div.breadcrumbs .bcsep{ background: -ms-linear-gradient(top, #ffffff 0%,#f2f2f2 100%); filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#ffffff', endColorstr='#f2f2f2',GradientType=0 ); background: linear-gradient(top, #ffffff 0%,#f2f2f2 100%); - width: 1004px; - padding: 10px; border: 1px solid #ddd; border-top: none; + padding: 0.5em 1em !important; } .wrapper #dokuwiki__pagetools ul, /* making a mess :P */ @@ -188,6 +190,11 @@ div.breadcrumbs .bcsep{ padding: 0 20px; } +.wrapper #dokuwiki__pagetools ul li:first-child{ + margin-left: 224px; +} + + #dokuwiki__pagetools{ background: #dbdfe0; background: -moz-linear-gradient(top, #dbdfe0 0%, #eaeaea 12%, #edf1f2 100%); @@ -275,10 +282,27 @@ div.breadcrumbs .bcsep{ .dokuwiki div.tocheader{ padding: 0.5em 1em; + background-color: #eee; + /* + background: -moz-linear-gradient(top, #ffffff 0%, #f4f4f4 30%, #eeeeee 99%, #cccccc 99%); + background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#ffffff), color-stop(30%,#f4f4f4), color-stop(99%,#eeeeee), color-stop(99%,#cccccc)); + background: -webkit-linear-gradient(top, #ffffff 0%,#f4f4f4 30%,#eeeeee 99%,#cccccc 99%); + background: -o-linear-gradient(top, #ffffff 0%,#f4f4f4 30%,#eeeeee 99%,#cccccc 99%); + background: -ms-linear-gradient(top, #ffffff 0%,#f4f4f4 30%,#eeeeee 99%,#cccccc 99%); + filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#ffffff', endColorstr='#cccccc',GradientType=0 ); + background: linear-gradient(top, #ffffff 0%,#f4f4f4 30%,#eeeeee 99%,#cccccc 99%); + */ + border-bottom: 1px solid #fff; + border-radius: 4px; + border-bottom-left-radius: 0; + border-bottom-right-radius: 0; + margin-bottom:0; } .dokuwiki #toc__inside{ padding: 0.75em 1em 1.5em; + border-bottom-left-radius: 4px; + border-bottom-right-radius: 4px; } .dokuwiki #toc__inside ul li{ @@ -288,7 +312,7 @@ div.breadcrumbs .bcsep{ .dokuwiki .secedit{ float: none; - margin: 0 0 1.4em 0; + margin: 0 ; text-align: right; } @@ -355,3 +379,13 @@ div.breadcrumbs .bcsep{ border-top-right-radius: 4px; border-bottom-right-radius: 4px; } + +#dokuwiki__usertools .inner ul{ + padding-left: 0; +} + +#dokuwiki__usertools .inner li{ + margin-left: 0; + margin-right: 1em; +} + diff --git a/todo.txt b/todo.txt new file mode 100644 index 000000000..19cf05615 --- /dev/null +++ b/todo.txt @@ -0,0 +1,20 @@ + + +------------- +Look at next: + +icons (start with the usertools? Decide where icons are needed) +footnotes +[[page name]] +breadcrumb +trace +Too much white/gray space +remove dashed line under downloadable +* alignment of usertools looks weird +check out old default and consider edit-page menu +TOC looks unstyled, too much indentation + +------------ +Anika todo: + +fix usertools not shrinking to viewport \ No newline at end of file -- cgit v1.2.3 From cc6b3a7efece479030d7e595125d4e3b9732e074 Mon Sep 17 00:00:00 2001 From: Clarence Lee Date: Mon, 29 Aug 2011 18:25:13 +0100 Subject: emphasize the page_id --- designs/edit_highlighting.psd | Bin 1952650 -> 3735833 bytes designs/edit_hightlight+toc.png | Bin 237593 -> 232650 bytes todo.txt | 7 ++++--- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/designs/edit_highlighting.psd b/designs/edit_highlighting.psd index 056bcbed9..92dab6575 100644 Binary files a/designs/edit_highlighting.psd and b/designs/edit_highlighting.psd differ diff --git a/designs/edit_hightlight+toc.png b/designs/edit_hightlight+toc.png index e8e16088f..82fb35fda 100644 Binary files a/designs/edit_hightlight+toc.png and b/designs/edit_hightlight+toc.png differ diff --git a/todo.txt b/todo.txt index 3ba7f75e4..0439d0da1 100644 --- a/todo.txt +++ b/todo.txt @@ -5,14 +5,15 @@ Look at next: icons (start with the usertools? Decide where icons are needed) footnotes -* [[page name]] breadcrumb trace +check out old default and consider edit-page menu +* TOC looks unstyled, too much indentation * Too much white/gray space * remove dashed line under downloadable * alignment of usertools looks weird -check out old default and consider edit-page menu -* TOC looks unstyled, too much indentation +* [[page name]] + ------------ Anika todo: -- cgit v1.2.3 From 9689ea45254e5216a34ad622c214c59e4ebb7f94 Mon Sep 17 00:00:00 2001 From: Clarence Lee Date: Mon, 29 Aug 2011 19:10:08 +0100 Subject: added attempted headers --- designs/blue.jpg | Bin 0 -> 73564 bytes designs/centered.jpg | Bin 0 -> 80147 bytes designs/dark_tools.jpg | Bin 0 -> 74213 bytes designs/too_print.jpg | Bin 0 -> 76596 bytes 4 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 designs/blue.jpg create mode 100644 designs/centered.jpg create mode 100644 designs/dark_tools.jpg create mode 100644 designs/too_print.jpg diff --git a/designs/blue.jpg b/designs/blue.jpg new file mode 100644 index 000000000..ea210de72 Binary files /dev/null and b/designs/blue.jpg differ diff --git a/designs/centered.jpg b/designs/centered.jpg new file mode 100644 index 000000000..465ee97df Binary files /dev/null and b/designs/centered.jpg differ diff --git a/designs/dark_tools.jpg b/designs/dark_tools.jpg new file mode 100644 index 000000000..c7c5181a1 Binary files /dev/null and b/designs/dark_tools.jpg differ diff --git a/designs/too_print.jpg b/designs/too_print.jpg new file mode 100644 index 000000000..7114286f2 Binary files /dev/null and b/designs/too_print.jpg differ -- cgit v1.2.3 From b3ffe8d9770dc74bb85f6a198e74486faebf394e Mon Sep 17 00:00:00 2001 From: Clarence Lee Date: Mon, 29 Aug 2011 19:35:07 +0100 Subject: baseline of aside matching content mockup --- designs/baseline_match_sidebar_approximate.png | Bin 0 -> 229283 bytes designs/edit_highlighting.psd | Bin 3735833 -> 3803290 bytes 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 designs/baseline_match_sidebar_approximate.png diff --git a/designs/baseline_match_sidebar_approximate.png b/designs/baseline_match_sidebar_approximate.png new file mode 100644 index 000000000..931ef5482 Binary files /dev/null and b/designs/baseline_match_sidebar_approximate.png differ diff --git a/designs/edit_highlighting.psd b/designs/edit_highlighting.psd index 92dab6575..8cb215d1c 100644 Binary files a/designs/edit_highlighting.psd and b/designs/edit_highlighting.psd differ -- cgit v1.2.3 From 7a88471ed974a33f2790d26b8b76fe2037bba7c6 Mon Sep 17 00:00:00 2001 From: Clarence Lee Date: Mon, 29 Aug 2011 20:04:20 +0100 Subject: align pagetools with content, include splitbrain feedback --- designs/align_page_tools_to_content.png | Bin 0 -> 229747 bytes designs/feedback_splitbrain.png | Bin 0 -> 83214 bytes 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 designs/align_page_tools_to_content.png create mode 100644 designs/feedback_splitbrain.png diff --git a/designs/align_page_tools_to_content.png b/designs/align_page_tools_to_content.png new file mode 100644 index 000000000..0ba3de2b9 Binary files /dev/null and b/designs/align_page_tools_to_content.png differ diff --git a/designs/feedback_splitbrain.png b/designs/feedback_splitbrain.png new file mode 100644 index 000000000..e5f023591 Binary files /dev/null and b/designs/feedback_splitbrain.png differ -- cgit v1.2.3 From 719043891cd939e6476ce100b13e1871367e01b7 Mon Sep 17 00:00:00 2001 From: Clarence Lee Date: Mon, 29 Aug 2011 20:05:32 +0100 Subject: align pagetools with center --- designs/align_page_tools_to_center.png | Bin 0 -> 230029 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 designs/align_page_tools_to_center.png diff --git a/designs/align_page_tools_to_center.png b/designs/align_page_tools_to_center.png new file mode 100644 index 000000000..3980f7c8b Binary files /dev/null and b/designs/align_page_tools_to_center.png differ -- cgit v1.2.3 From af2e65f05f3e88d90a3df4afed13953ceb268f96 Mon Sep 17 00:00:00 2001 From: Clarence Lee Date: Mon, 29 Aug 2011 20:12:08 +0100 Subject: rearrange pagetools with edit in center --- designs/align_edit_of_page_tools_to_center.png | Bin 0 -> 230167 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 designs/align_edit_of_page_tools_to_center.png diff --git a/designs/align_edit_of_page_tools_to_center.png b/designs/align_edit_of_page_tools_to_center.png new file mode 100644 index 000000000..a1c4a9b25 Binary files /dev/null and b/designs/align_edit_of_page_tools_to_center.png differ -- cgit v1.2.3 From 75d210e85dbcff0a6563cb2e31e8c41260f3f7a8 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Mon, 3 Oct 2011 12:19:27 +0100 Subject: main changes for new design --- css/_toc.css | 16 +- css/basic.css | 22 ++- css/default.css | 71 --------- css/design.css | 260 ++++++++++++++++++------------- css/structure.css | 22 +-- images/pagetools/arrow_redo.png | Bin 0 -> 625 bytes images/pagetools/arrow_up.png | Bin 0 -> 372 bytes images/pagetools/email_star.png | Bin 0 -> 739 bytes images/pagetools/inbox-document-text.png | Bin 0 -> 665 bytes images/pagetools/page.png | Bin 0 -> 635 bytes images/pagetools/page_code.png | Bin 0 -> 818 bytes images/pagetools/pencil.png | Bin 0 -> 450 bytes images/pagetools/time.png | Bin 0 -> 793 bytes images/search.png | Bin 0 -> 461 bytes main.php | 56 +++---- style.ini | 11 +- 16 files changed, 222 insertions(+), 236 deletions(-) delete mode 100644 css/default.css create mode 100644 images/pagetools/arrow_redo.png create mode 100644 images/pagetools/arrow_up.png create mode 100644 images/pagetools/email_star.png create mode 100644 images/pagetools/inbox-document-text.png create mode 100644 images/pagetools/page.png create mode 100644 images/pagetools/page_code.png create mode 100644 images/pagetools/pencil.png create mode 100644 images/pagetools/time.png create mode 100644 images/search.png diff --git a/css/_toc.css b/css/_toc.css index 5bff9f648..0213a1829 100755 --- a/css/_toc.css +++ b/css/_toc.css @@ -9,12 +9,12 @@ /* toc container */ .dokuwiki div.toc { float: right; - margin: -0.3em 0 .5em 1.4em; + margin: -2em -2em .5em 1.4em; /* @todo: possible to make calculation sort of automatic? */ - width: 200px; /* __sidebar_width__ - margin-left */ - margin-left: 20px; - /*width: 12em;*/ - font-size: 0.75em; + /*width: 200px; __sidebar_width__ - margin-left */ + width: __sidebar_width__; + font-size: 0.9em; + border-left: 1px solid __border__; } /*____________ toc header ____________*/ @@ -23,14 +23,16 @@ padding: 0.5em 1em; margin-bottom: .2em; font-weight: bold; + /* background-color: __background_alt__; color: __text__; + */ } /* css arrow */ .dokuwiki .toc span.toc_open, .dokuwiki .toc span.toc_close { - border: .4em solid __background_alt__; + border: .4em solid __background__; float: right; display: block; margin: 0 .2em 0 0; @@ -52,8 +54,10 @@ .dokuwiki #toc__inside { padding: 0.75em 1em 1.5em; + /* background-color: __background_alt__; color: __text__; + */ } .dokuwiki #toc__inside ul { padding: 0 0 0 1.5em; diff --git a/css/basic.css b/css/basic.css index fc0b99efc..3c7e6dc74 100755 --- a/css/basic.css +++ b/css/basic.css @@ -13,7 +13,16 @@ html { overflow-y: scroll; } html, body { - background-color: __background__; + background-color: #fbfaf9; + background: -moz-linear-gradient( top, #ddd 0%, #eee 1em, #fbfaf9 4em); + /* do we want to support old browsers? + background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#ddd), color-stop(1em,#eee), color-stop(4em,#fbfaf9)); + filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#ddd', endColorstr='#fbfaf9',GradientType=0 ); + */ + background: -webkit-linear-gradient(top, #ddd 0%, #eee 1em, #fbfaf9 4em); + background: -o-linear-gradient( top, #ddd 0%, #eee 1em, #fbfaf9 4em); + background: -ms-linear-gradient( top, #ddd 0%, #eee 1em, #fbfaf9 4em); + background: linear-gradient( top, #ddd 0%, #eee 1em, #fbfaf9 4em); color: __text__; margin: 0; padding: 0; @@ -135,7 +144,7 @@ a { } a:link, a:visited { text-decoration: none; - color: #00c; /* §colour */ + color: __link__; /* §colour */ } a:link:hover, a:visited:hover, a:link:focus, a:visited:focus, @@ -161,11 +170,12 @@ img { } hr { - border-style: solid; - border-width: 1px 0 0; - text-align: center; + border-top: solid #ccc; + border-bottom: solid #fff; + border-width: 1px 0; height: 0; width: 100%; + text-align: center; clear: both; } @@ -253,7 +263,7 @@ option { font-style: normal; font-weight: normal; } /* @todo: either make input.edit and buttons more generic or put into design.css */ .dokuwiki input.edit { border: 1px solid __border__; - padding: 0.41em 0; + padding: 0.35em .1em; -moz-box-shadow: inset 0 0 1px __background_alt__; -webkit-box-shadow: inset 0 0 1px __background_alt__; box-shadow: inset 0 0 1px __background_alt__; diff --git a/css/default.css b/css/default.css deleted file mode 100644 index f402cbdde..000000000 --- a/css/default.css +++ /dev/null @@ -1,71 +0,0 @@ -#dokuwiki__header h1 a{ - font-size: 24px; -} - -#dokuwiki__header{ - padding-top: 3.5em; - padding-bottom: 1em; -} - -#page_id{ - font-size: 0.875em; - padding-bottom: 1em; - color: #888; -} - -.breadcrumbs{ - margin-bottom: 0 !important; - padding-bottom: 0 !important; - color: #888; -} - -#dokuwiki__content .page{ - position: relative; -} - -/*____________ basic ____________*/ - -a:link{ - color: #06d; -} -a:visited{ - color: #2E5E94; - border-bottom: 1px dotted #09d; -} - -/*____________ content ____________*/ - -.mode_show #dokuwiki__content h1{ - line-height: 1.175em; -} - -.mode_show #dokuwiki__aside{ - /*border-top: 1px solid #ccc;*/ - font-size: 0.87em; - /* @todo: is 1.5 intentional? shouldn't it be less? */ - line-height: 1.5; -} - -.mode_show #dokuwiki__aside h1{ - font-size: 1.25em; - margin-top: 1.25em; -} - -.mode_show #dokuwiki__aside h1:first-child{ - margin-top: 0; -} - - -/*____________ _edit ____________*/ - -.dokuwiki .secedit { - float: none; - margin: -1em 0 1.4em 0; - text-align: right; -} -.dokuwiki div.secedit { -} -.dokuwiki .secedit input.button { - padding: 0.5em 0.9em; - color: #555; -} diff --git a/css/design.css b/css/design.css index 751631afc..f1285aae9 100755 --- a/css/design.css +++ b/css/design.css @@ -7,30 +7,23 @@ * @author Clarence Lee */ - /* header ********************************************************************/ #dokuwiki__header { - padding: 4em 0 2em; - background-color: __background_alt__; - /* @todo: add gradients for other browsers */ - background: -webkit-linear-gradient(top, __background_alt__ 98%, __background_neu__ 100%); -} -#IE7 #dokuwiki__header { -} -#dokuwiki__header .pad { - padding: 0 1em; /* @pad */ + padding: 2em 0; } -#dokuwiki__header .headings { +#dokuwiki__header .headings, +#dokuwiki__header .tools { margin-bottom: 1em; } #dokuwiki__header h1 { margin-bottom: 0; - font-size: 2.25em; - font-weight: bold; + font-size: 1.5em; + /* text-shadow: 1px 1px 0px #fff; + */ } #dokuwiki__header h1 a { text-decoration: none; @@ -38,22 +31,18 @@ color: #000; background-color: inherit; } +#dokuwiki__header h1 a:hover, +#dokuwiki__header h1 a:active, +#dokuwiki__header h1 a:focus { +} #dokuwiki__header p.claim { margin-bottom: 0; - /* @todo: style.ini */ - color: #888; - font-style: italic; + /*color: __text_neu__;*/ font-size: 0.875em; } #dokuwiki__header .tools { - margin-bottom: 1em; -} -#dokuwiki__header .tools ul { - margin-bottom: 0; -} -#dokuwiki__header .tools ul li { - display: inline; + margin-top: .2em; } @@ -73,124 +62,156 @@ font-weight: bold; } -#dokuwiki__usertools ul, -#dokuwiki__sitetools ul, -#dokuwiki__pagetools ul { +#dokuwiki__header .tools ul { padding-left: 0; + margin-bottom: 0; } -#dokuwiki__usertools ul li, -#dokuwiki__sitetools ul li, -#dokuwiki__pagetools ul li { +#dokuwiki__header .tools li { font-size: 0.875em; margin-left: 1em; -} -#dokuwiki__usertools ul li, -#dokuwiki__pagetools ul li { - margin-top: .7em; - margin-bottom: .7em; - float: left; list-style: none; + display: inline; } /*____________ user tools ____________*/ #dokuwiki__usertools { position: absolute; - top: 0; - left: 0; - text-align: left; + top: .5em; + right: .5em; + text-align: right; width: 100%; } #dokuwiki__usertools ul { - /* @todo: style.ini colours for gradients? */ - background-color: __background__; - background: -moz-linear-gradient(top, #ffffff 0%, #f2f2f2 100%); - background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#ffffff), color-stop(100%,#f2f2f2)); - background: -webkit-linear-gradient(top, #ffffff 0%,#f2f2f2 100%); - background: -o-linear-gradient(top, #ffffff 0%,#f2f2f2 100%); - background: -ms-linear-gradient(top, #ffffff 0%,#f2f2f2 100%); - filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#ffffff', endColorstr='#f2f2f2',GradientType=0 ); - background: linear-gradient(top, #ffffff 0%,#f2f2f2 100%); - border: solid __background_neu__; - border-width: 0 1px 1px; - border-bottom-left-radius: .3em; - border-bottom-right-radius: .3em; margin: 0 auto; padding: 0; max-width: __site_width__; - overflow: hidden; } #IE6 #dokuwiki__usertools ul { width: 100%; } -#dokuwiki__usertools ul li { - margin: .7em 0 .7em 1em; - float: left; - list-style: none; -} #dokuwiki__usertools ul li.user { } /*____________ page tools ____________*/ #dokuwiki__pagetools { + position: absolute; + right: -32px; + top: 1em; + font-size: 90%; +} + +#dokuwiki__pagetools div.tools { position: fixed; - bottom: 0; - left: 0; - width: 100%; - z-index: 10; - background: #dbdfe0; - background: -moz-linear-gradient(top, #dbdfe0 0%, #eaeaea 12%, #edf1f2 100%); - background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#dbdfe0), color-stop(12%,#eaeaea), color-stop(100%,#edf1f2)); - background: -webkit-linear-gradient(top, #dbdfe0 0%,#eaeaea 12%,#edf1f2 100%); - background: -o-linear-gradient(top, #dbdfe0 0%,#eaeaea 12%,#edf1f2 100%); - background: -ms-linear-gradient(top, #dbdfe0 0%,#eaeaea 12%,#edf1f2 100%); - filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#dbdfe0', endColorstr='#edf1f2',GradientType=0 ); - background: linear-gradient(top, #dbdfe0 0%,#eaeaea 12%,#edf1f2 100%); -} -#IE6 #dokuwiki__content { - margin-bottom: 1.4em; } + #dokuwiki__pagetools ul { - margin: 0 auto; - max-width: __site_width__; - padding: 0 1em; /* @pad */ + position: absolute; + right: 0; + width: 32px; + overflow: hidden; + border: solid __border__; + border-width: 1px 1px 1px 0; + border-radius: 2px; + text-align: right; + margin: 0; + padding: 0; + background-color: __background__; + color: inherit; +} + +#dokuwiki__pagetools:hover ul, +#dokuwiki__pagetools:active ul, +#dokuwiki__pagetools:focus ul { + width: auto; + border-width: 1px; } + #dokuwiki__pagetools ul li { - margin: .7em 1em .7em 0; + padding: 4px 2px; + margin: 0; + list-style: none; } -#dokuwiki__pagetools ul { - position: relative; +#dokuwiki__pagetools:hover ul li, +#dokuwiki__pagetools:active ul li, +#dokuwiki__pagetools:focus ul li { + padding: 4px 4px; } -#dokuwiki__pagetools ul li a.action.top { - position: absolute; - top: .7em; - right: 0; + +#dokuwiki__pagetools ul li a { + white-space: nowrap; + background-repeat: no-repeat; + padding-right: 0; + padding-left: 32px; + background-position: 10px center; +} + +#dokuwiki__pagetools:hover ul li a, +#dokuwiki__pagetools:active ul li a, +#dokuwiki__pagetools:focus ul li a { + padding-right: 32px; + padding-left: 0; + background-position: right center; +} + +/* @todo: add NEW icons */ +#dokuwiki__pagetools ul li a.edit { + background-image: url(images/pagetools/pencil.png); +} +#dokuwiki__pagetools ul li a.show { + background-image: url(images/pagetools/page.png); +} +#dokuwiki__pagetools ul li a.create { + background-image: url(images/pagetools/pencil_add.png); +} +#dokuwiki__pagetools ul li a.draft { + background-image: url(images/pagetools/inbox-document-text.png); +} +#dokuwiki__pagetools ul li a.source { + background-image: url(images/pagetools/page_code.png); +} +#dokuwiki__pagetools ul li a.revs { + background-image: url(images/pagetools/time.png); +} +#dokuwiki__pagetools ul li a.backlink { + background-image: url(images/pagetools/arrow_redo.png); +} +#dokuwiki__pagetools ul li a.subscribe { + background-image: url(images/pagetools/email_star.png); +} +#dokuwiki__pagetools ul li a.top { + background-image: url(images/pagetools/arrow_up.png); } + /*____________ site tools ____________*/ #dokuwiki__sitetools { - /* @todo: is the width still needed? */ - width: __sidebar_width__; text-align: right; } #dokuwiki__sitetools form.search { display: block; font-size: 0.875em; + position: relative; } #dokuwiki__sitetools form.search input.edit { - /* @todo: em doesn't fit with px value for sitetools div */ - width: 12em; - border-right: none; - border-bottom-right-radius: 0; - border-top-right-radius: 0; + width: 16em; + padding-right: 22px; } #dokuwiki__sitetools form.search input.button { +/* border-bottom-left-radius: 0; border-top-left-radius: 0; padding: 0.5em 0.75em; +*/ + background: transparent url(images/search.png) no-repeat 0 0; + border-width: 0; + width: 14px; + height: 14px; + text-indent: -99999px; + margin-left: -20px; } #dokuwiki__sitetools ul { @@ -199,12 +220,33 @@ #dokuwiki__sitetools li { } +/*____________ breadcrumbs ____________*/ + +.dokuwiki div.breadcrumbs { + border: 1px solid __border__; + padding: .1em .35em; + -moz-box-shadow: inset 0 0 1px __background_alt__; + -webkit-box-shadow: inset 0 0 1px __background_alt__; + box-shadow: inset 0 0 1px __background_alt__; + border-radius: 2px; + /* @todo: style.ini */ + background-color: #fdfdfd; + margin-bottom: .5em; + font-size: 0.875em; +} +.dokuwiki div.breadcrumbs a { + color: __link__; + background-color: inherit; +} +.dokuwiki div.breadcrumbs .bcsep { + font-size: 0.75em; +} + /* sidebar ********************************************************************/ #dokuwiki__aside { - padding-top: .4em; line-height: 1.2; } @@ -233,24 +275,28 @@ /* content ********************************************************************/ -.dokuwiki .page { +.dokuwiki .pageId { + position: absolute; + top: -1.5em; + right: .5em; + font-size: 0.875em; + border: solid __border__; + border-width: 1px 1px 0; + background-color: __background__; + color: __text_alt__; + padding: .1em .35em; + border-top-left-radius: 2px; + border-top-right-radius: 2px; } -/*____________ breadcrumbs ____________*/ +.dokuwiki .page { + background: __background__; + color: inherit; + border: 1px solid #eee; + box-shadow: 0 0 .5em #999; + border-radius: 2px; + padding: 2em; -.dokuwiki div.breadcrumbs { - /*border-top: 1px solid #ccc;*/ - padding: 0.2em 0 0.75em 0; - margin-bottom: 0.6em; - font-size: 0.875em; -} -.dokuwiki div.breadcrumbs a { - /* @todo: wiki page colour or external link colour? */ - color: __existing__; - background-color: inherit; -} -.dokuwiki div.breadcrumbs .bcsep { - font-size: 0.75em; } /*____________ misc ____________*/ @@ -299,10 +345,10 @@ ********************************************************************/ .dokuwiki .wrapper { - margin-bottom: 2.8em; + margin-bottom: 1.4em; } #IE6 .dokuwiki .wrapper { - margin-bottom: 1.4em; + margin-bottom: .7em; } #dokuwiki__footer { diff --git a/css/structure.css b/css/structure.css index 638d882b4..82ed17031 100755 --- a/css/structure.css +++ b/css/structure.css @@ -8,16 +8,17 @@ body { margin: 0 auto; } #dokuwiki__site { + margin: 0 auto; + max-width: __site_width__; } #dokuwiki__site .site { + padding: 0 .5em; } #dokuwiki__header { width: 100%; } #dokuwiki__header .pad { - margin: 0 auto; - max-width: __site_width__; } #dokuwiki__header .headings { float: left; @@ -35,20 +36,13 @@ body { #dokuwiki__site .wrapper { position: relative; - margin: 0 auto; - max-width: __site_width__; - padding: 1.4em 1em; /* @pad */ } #IE6 #dokuwiki__site .wrapper, #IE7 #dokuwiki__site .wrapper { height: 1%; } - /* show sidebar only in show mode */ #dokuwiki__aside { - display: none; - } - .mode_show #dokuwiki__aside { width: __sidebar_width__; float: left; position: relative; @@ -58,21 +52,19 @@ body { margin: 0 1.5em 0 0; } - /* make content wider when there's no sidebar */ - .mode_show #dokuwiki__content { + #dokuwiki__content { float: right; margin-left: -__sidebar_width__; width: 100%; } - .mode_show #dokuwiki__content .pad { + #dokuwiki__content .pad { margin-left: __sidebar_width__; } #dokuwiki__footer { clear: both; - margin: 0 auto; - max-width: __site_width__; - padding: 0 1em 2.4em; /* @pad */ + padding: 0 0 2.4em; /* @pad */ + margin-left: __sidebar_width__; } #dokuwiki__footer .pad { } diff --git a/images/pagetools/arrow_redo.png b/images/pagetools/arrow_redo.png new file mode 100644 index 000000000..fdc394c7c Binary files /dev/null and b/images/pagetools/arrow_redo.png differ diff --git a/images/pagetools/arrow_up.png b/images/pagetools/arrow_up.png new file mode 100644 index 000000000..1ebb19324 Binary files /dev/null and b/images/pagetools/arrow_up.png differ diff --git a/images/pagetools/email_star.png b/images/pagetools/email_star.png new file mode 100644 index 000000000..82608102e Binary files /dev/null and b/images/pagetools/email_star.png differ diff --git a/images/pagetools/inbox-document-text.png b/images/pagetools/inbox-document-text.png new file mode 100644 index 000000000..f56c8e47c Binary files /dev/null and b/images/pagetools/inbox-document-text.png differ diff --git a/images/pagetools/page.png b/images/pagetools/page.png new file mode 100644 index 000000000..03ddd799f Binary files /dev/null and b/images/pagetools/page.png differ diff --git a/images/pagetools/page_code.png b/images/pagetools/page_code.png new file mode 100644 index 000000000..f7ea90419 Binary files /dev/null and b/images/pagetools/page_code.png differ diff --git a/images/pagetools/pencil.png b/images/pagetools/pencil.png new file mode 100644 index 000000000..0bfecd50e Binary files /dev/null and b/images/pagetools/pencil.png differ diff --git a/images/pagetools/time.png b/images/pagetools/time.png new file mode 100644 index 000000000..911da3f1d Binary files /dev/null and b/images/pagetools/time.png differ diff --git a/images/search.png b/images/search.png new file mode 100644 index 000000000..25553ce8b Binary files /dev/null and b/images/search.png differ diff --git a/main.php b/main.php index abf782997..cc02f0a64 100755 --- a/main.php +++ b/main.php @@ -81,6 +81,7 @@ $showTools = !tpl_getConf('hideTools') || ( tpl_getConf('hideTools') && $_SERVER
@@ -89,28 +90,35 @@ $showTools = !tpl_getConf('hideTools') || ( tpl_getConf('hideTools') && $_SERVER
+ + + +
+ + +
+ +
+ +
+ +
+
+
-
- - - -
- - -
- -
[[page_id]]
+
[[]]
+
@@ -121,12 +129,6 @@ $showTools = !tpl_getConf('hideTools') || ( tpl_getConf('hideTools') && $_SERVER
- -
- -
-
-
@@ -134,16 +136,18 @@ $showTools = !tpl_getConf('hideTools') || ( tpl_getConf('hideTools') && $_SERVER

-
    - -
+
+
    + +
+
diff --git a/style.ini b/style.ini index 0eeaf15d3..fe4f35e07 100755 --- a/style.ini +++ b/style.ini @@ -25,7 +25,7 @@ css/_modal.css = screen css/_forms.css = screen css/_admin.css = screen css/includes.css = screen -css/default.css = screen +#css/default.css = screen css/rtl.css = rtl css/print.css = print @@ -55,6 +55,7 @@ __border__ = "#ccc" ;-------------------------------------------------------------------------- ; these are used for links +__link__ = "#627D9A" __existing__ = "#090" __missing__ = "#f30" @@ -63,7 +64,7 @@ __highlight__ = "#ff9" ; sidebar width ; @todo: width in em or px? -;__site_width__ = "64em" -__site_width__ = "1000px" -;__sidebar_width__ = "16em" -__sidebar_width__ = "220px" +__site_width__ = "72em" +;__site_width__ = "1000px" +__sidebar_width__ = "16em" +;__sidebar_width__ = "220px" -- cgit v1.2.3 From 1ffabdee7226b0ca1806784ebcb357b800a0f946 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Mon, 3 Oct 2011 13:41:55 +0100 Subject: added logo and minor fixes --- css/_toc.css | 2 ++ css/design.css | 30 +++++++++++++++++++++++++++++- images/logo.png | Bin 0 -> 12212 bytes main.php | 13 +++++++------ 4 files changed, 38 insertions(+), 7 deletions(-) create mode 100644 images/logo.png diff --git a/css/_toc.css b/css/_toc.css index 0213a1829..1462eb83f 100755 --- a/css/_toc.css +++ b/css/_toc.css @@ -15,6 +15,8 @@ width: __sidebar_width__; font-size: 0.9em; border-left: 1px solid __border__; + background: __background__; + color: inherit; } /*____________ toc header ____________*/ diff --git a/css/design.css b/css/design.css index f1285aae9..8111091fd 100755 --- a/css/design.css +++ b/css/design.css @@ -17,6 +17,15 @@ #dokuwiki__header .headings, #dokuwiki__header .tools { margin-bottom: 1em; + width: 50%; +} +#dokuwiki__header h1 img { + float: left; + margin-right: .5em; +} +#dokuwiki__header h1 span { + display: block; + padding-top: 10px; } #dokuwiki__header h1 { margin-bottom: 0; @@ -234,6 +243,19 @@ margin-bottom: .5em; font-size: 0.875em; } +/* alternative: +.dokuwiki div.breadcrumbs { + border-top: 1px solid __border__; + border-bottom: 1px solid __background__; + margin-bottom: .5em; + font-size: 0.875em; +} +.dokuwiki div.breadcrumbs div { + border-top: 1px solid __background__; + border-bottom: 1px solid __border__; + padding: .1em .35em; +} +*/ .dokuwiki div.breadcrumbs a { color: __link__; background-color: inherit; @@ -271,6 +293,12 @@ margin-bottom: 0; } +#dokuwiki__aside a:link, +#dokuwiki__aside a:visited { + color: __link__; + background-color: inherit; +} + /* content ********************************************************************/ @@ -289,7 +317,7 @@ border-top-right-radius: 2px; } -.dokuwiki .page { +.dokuwiki div.page { background: __background__; color: inherit; border: 1px solid #eee; diff --git a/images/logo.png b/images/logo.png new file mode 100644 index 000000000..8b794dd64 Binary files /dev/null and b/images/logo.png differ diff --git a/main.php b/main.php index cc02f0a64..4c6661664 100755 --- a/main.php +++ b/main.php @@ -38,10 +38,11 @@ $showTools = !tpl_getConf('hideTools') || ( tpl_getConf('hideTools') && $_SERVER
-

- ','id="dokuwiki__top" accesskey="h" title="[H]"') */ ?> +

'.$conf['title'].'', + 'id="dokuwiki__top" accesskey="h" title="[H]"' + ) /* @todo: obviously don't use tpl_getFavicon, but make a new function (or use a config option?) */ ?>

@@ -93,10 +94,10 @@ $showTools = !tpl_getConf('hideTools') || ( tpl_getConf('hideTools') && $_SERVER -
+
-
+
-- cgit v1.2.3 From 4a44843d9c2d845955dcb32437bcc282c4820f86 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Mon, 3 Oct 2011 20:58:09 +0100 Subject: changed breadcrumbs design, small fixes: pageid, pagetools and sidebar --- css/design.css | 24 +++++------------------- main.php | 37 +++++++++++++++++-------------------- 2 files changed, 22 insertions(+), 39 deletions(-) diff --git a/css/design.css b/css/design.css index 8111091fd..bde14b613 100755 --- a/css/design.css +++ b/css/design.css @@ -106,7 +106,7 @@ #dokuwiki__pagetools { position: absolute; - right: -32px; + right: -34px; top: 1em; font-size: 90%; } @@ -120,8 +120,7 @@ right: 0; width: 32px; overflow: hidden; - border: solid __border__; - border-width: 1px 1px 1px 0; + border: 1px solid __border__; border-radius: 2px; text-align: right; margin: 0; @@ -134,7 +133,6 @@ #dokuwiki__pagetools:active ul, #dokuwiki__pagetools:focus ul { width: auto; - border-width: 1px; } #dokuwiki__pagetools ul li { @@ -231,31 +229,18 @@ /*____________ breadcrumbs ____________*/ -.dokuwiki div.breadcrumbs { - border: 1px solid __border__; - padding: .1em .35em; - -moz-box-shadow: inset 0 0 1px __background_alt__; - -webkit-box-shadow: inset 0 0 1px __background_alt__; - box-shadow: inset 0 0 1px __background_alt__; - border-radius: 2px; - /* @todo: style.ini */ - background-color: #fdfdfd; - margin-bottom: .5em; - font-size: 0.875em; -} -/* alternative: .dokuwiki div.breadcrumbs { border-top: 1px solid __border__; border-bottom: 1px solid __background__; margin-bottom: .5em; font-size: 0.875em; + clear: both; } -.dokuwiki div.breadcrumbs div { +.dokuwiki div.breadcrumbs div.pad { border-top: 1px solid __background__; border-bottom: 1px solid __border__; padding: .1em .35em; } -*/ .dokuwiki div.breadcrumbs a { color: __link__; background-color: inherit; @@ -270,6 +255,7 @@ #dokuwiki__aside { line-height: 1.2; + font-size: 0.875em; } /* make sidebar more condensed */ diff --git a/main.php b/main.php index 4c6661664..6dee80d78 100755 --- a/main.php +++ b/main.php @@ -35,9 +35,9 @@ $showTools = !tpl_getConf('hideTools') || ( tpl_getConf('hideTools') && $_SERVER -
+
-
+

'.$conf['title'].'', @@ -50,10 +50,9 @@ $showTools = !tpl_getConf('hideTools') || ( tpl_getConf('hideTools') && $_SERVER
-

-
+
@@ -90,47 +89,45 @@ $showTools = !tpl_getConf('hideTools') || ( tpl_getConf('hideTools') && $_SERVER
-
- - -
- - -
- + +
+ +
+ + +
+ +
+
-
-
+
-
-
+
-
[[]]
+
-
+
-
-
-- cgit v1.2.3 From cfe4d18b80fe91b04d8df350c60b2d7ebf6086e2 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Mon, 3 Oct 2011 21:04:34 +0100 Subject: small fix for footer --- css/structure.css | 1 - main.php | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/css/structure.css b/css/structure.css index 82ed17031..ba56d0b89 100755 --- a/css/structure.css +++ b/css/structure.css @@ -63,7 +63,6 @@ body { #dokuwiki__footer { clear: both; - padding: 0 0 2.4em; /* @pad */ margin-left: __sidebar_width__; } #dokuwiki__footer .pad { diff --git a/main.php b/main.php index 6dee80d78..e234bab2c 100755 --- a/main.php +++ b/main.php @@ -104,7 +104,7 @@ $showTools = !tpl_getConf('hideTools') || ( tpl_getConf('hideTools') && $_SERVER
-
+
-- cgit v1.2.3 From 6a9cea3ef7851df6752803b11bec57932df671e0 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Mon, 3 Oct 2011 23:16:16 +0100 Subject: small fixes: search box, structure in IE, gradient in Chrome --- css/basic.css | 19 ++++++++++++------- css/design.css | 17 ++++++----------- css/structure.css | 6 ------ 3 files changed, 18 insertions(+), 24 deletions(-) diff --git a/css/basic.css b/css/basic.css index 3c7e6dc74..ef4e3b272 100755 --- a/css/basic.css +++ b/css/basic.css @@ -13,17 +13,20 @@ html { overflow-y: scroll; } html, body { + /* @todo: style.ini */ background-color: #fbfaf9; - background: -moz-linear-gradient( top, #ddd 0%, #eee 1em, #fbfaf9 4em); + color: __text__; + background-image: -moz-linear-gradient( top, #ddd 0%, #eee 1em, #fbfaf9 4em); /* do we want to support old browsers? - background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#ddd), color-stop(1em,#eee), color-stop(4em,#fbfaf9)); + background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#ddd), color-stop(1em,#eee), color-stop(4em,#fbfaf9)); filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#ddd', endColorstr='#fbfaf9',GradientType=0 ); */ - background: -webkit-linear-gradient(top, #ddd 0%, #eee 1em, #fbfaf9 4em); - background: -o-linear-gradient( top, #ddd 0%, #eee 1em, #fbfaf9 4em); - background: -ms-linear-gradient( top, #ddd 0%, #eee 1em, #fbfaf9 4em); - background: linear-gradient( top, #ddd 0%, #eee 1em, #fbfaf9 4em); - color: __text__; + background-image: -webkit-linear-gradient(top, #ddd 0%, #eee 1em, #fbfaf9 4em); + background-image: -o-linear-gradient( top, #ddd 0%, #eee 1em, #fbfaf9 4em); + background-image: -ms-linear-gradient( top, #ddd 0%, #eee 1em, #fbfaf9 4em); + background-image: linear-gradient( top, #ddd 0%, #eee 1em, #fbfaf9 4em); + background-size: 1px 10em; + background-repeat: repeat-x; margin: 0; padding: 0; } @@ -282,7 +285,9 @@ option { font-style: normal; font-weight: normal; } background: -webkit-linear-gradient(top, #ffffff 0%,#f4f4f4 30%,#eeeeee 99%,#cccccc 99%); background: -o-linear-gradient(top, #ffffff 0%,#f4f4f4 30%,#eeeeee 99%,#cccccc 99%); background: -ms-linear-gradient(top, #ffffff 0%,#f4f4f4 30%,#eeeeee 99%,#cccccc 99%); + /* filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#ffffff', endColorstr='#cccccc',GradientType=0 ); + */ background: linear-gradient(top, #ffffff 0%,#f4f4f4 30%,#eeeeee 99%,#cccccc 99%); border: 1px solid #ccc; border-radius: 2px; diff --git a/css/design.css b/css/design.css index bde14b613..8def2faa9 100755 --- a/css/design.css +++ b/css/design.css @@ -17,7 +17,7 @@ #dokuwiki__header .headings, #dokuwiki__header .tools { margin-bottom: 1em; - width: 50%; + width: 49%; } #dokuwiki__header h1 img { float: left; @@ -106,7 +106,7 @@ #dokuwiki__pagetools { position: absolute; - right: -34px; + right: -33px; top: 1em; font-size: 90%; } @@ -120,7 +120,7 @@ right: 0; width: 32px; overflow: hidden; - border: 1px solid __border__; + border: 1px solid __background_alt__; border-radius: 2px; text-align: right; margin: 0; @@ -208,14 +208,9 @@ padding-right: 22px; } #dokuwiki__sitetools form.search input.button { -/* - border-bottom-left-radius: 0; - border-top-left-radius: 0; - padding: 0.5em 0.75em; -*/ background: transparent url(images/search.png) no-repeat 0 0; border-width: 0; - width: 14px; + width: 19px; height: 14px; text-indent: -99999px; margin-left: -20px; @@ -292,9 +287,9 @@ .dokuwiki .pageId { position: absolute; top: -1.5em; - right: .5em; + right: 1em; font-size: 0.875em; - border: solid __border__; + border: solid __background_alt__; border-width: 1px 1px 0; background-color: __background__; color: __text_alt__; diff --git a/css/structure.css b/css/structure.css index ba56d0b89..7de4401d7 100755 --- a/css/structure.css +++ b/css/structure.css @@ -23,16 +23,10 @@ body { #dokuwiki__header .headings { float: left; } - #IE6 #dokuwiki__header .headings { - width: 50%; - } #dokuwiki__header .tools { float: right; text-align: right; } - #IE6 #dokuwiki__header .tools { - width: 50%; - } #dokuwiki__site .wrapper { position: relative; -- cgit v1.2.3 From b2932b97919a9bc8ce4913bf8827e1bda9585d94 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Tue, 4 Oct 2011 00:22:16 +0100 Subject: less markup for breadcrumbs (but more lines for IE<9) --- css/design.css | 12 +++++++++++- main.php | 4 ++-- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/css/design.css b/css/design.css index 8def2faa9..3a9725f34 100755 --- a/css/design.css +++ b/css/design.css @@ -231,11 +231,21 @@ font-size: 0.875em; clear: both; } -.dokuwiki div.breadcrumbs div.pad { +.dokuwiki div.breadcrumbs div { border-top: 1px solid __background__; border-bottom: 1px solid __border__; padding: .1em .35em; } +.dokuwiki div.breadcrumbs div:first-child { + border-bottom-width: 0; +} +#IE7 .dokuwiki div.breadcrumbs div:first-child, +#IE8 .dokuwiki div.breadcrumbs div:first-child { + border-bottom-width: 1px; +} +.dokuwiki div.breadcrumbs div:last-child { + border-top-width: 0; +} .dokuwiki div.breadcrumbs a { color: __link__; background-color: inherit; diff --git a/main.php b/main.php index e234bab2c..c186eeea0 100755 --- a/main.php +++ b/main.php @@ -91,14 +91,14 @@ $showTools = !tpl_getConf('hideTools') || ( tpl_getConf('hideTools') && $_SERVER -
+
-
+
-- cgit v1.2.3 From f318df2e9abf46fa22f327de3e1336b45ba4a994 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Tue, 4 Oct 2011 00:36:40 +0100 Subject: fix breadcrumbs (just introduced bug for single instances) --- css/design.css | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/css/design.css b/css/design.css index 3a9725f34..984582459 100755 --- a/css/design.css +++ b/css/design.css @@ -232,20 +232,24 @@ clear: both; } .dokuwiki div.breadcrumbs div { + padding: .1em .35em; +} + +.dokuwiki div.breadcrumbs div:only-child { border-top: 1px solid __background__; border-bottom: 1px solid __border__; - padding: .1em .35em; } .dokuwiki div.breadcrumbs div:first-child { - border-bottom-width: 0; + border-top: 1px solid __background__; } -#IE7 .dokuwiki div.breadcrumbs div:first-child, -#IE8 .dokuwiki div.breadcrumbs div:first-child { - border-bottom-width: 1px; +#IE7 .dokuwiki div.breadcrumbs div, +#IE8 .dokuwiki div.breadcrumbs div { + border-bottom: 1px solid __border__; } .dokuwiki div.breadcrumbs div:last-child { - border-top-width: 0; + border-bottom: 1px solid __border__; } + .dokuwiki div.breadcrumbs a { color: __link__; background-color: inherit; -- cgit v1.2.3 From d6d062e44afec88d9b6021c87aeb577f44b80a2a Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Tue, 4 Oct 2011 00:37:32 +0100 Subject: gave logo image dimensions (so that title headlines doesn't jump) --- main.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main.php b/main.php index c186eeea0..2d243a950 100755 --- a/main.php +++ b/main.php @@ -40,7 +40,7 @@ $showTools = !tpl_getConf('hideTools') || ( tpl_getConf('hideTools') && $_SERVER

'.$conf['title'].'', + ' '.$conf['title'].'', 'id="dokuwiki__top" accesskey="h" title="[H]"' ) /* @todo: obviously don't use tpl_getFavicon, but make a new function (or use a config option?) */ ?>

-- cgit v1.2.3 From 2ce1ed3f07c00eb9172cbe39f9dea296f1087d26 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Wed, 5 Oct 2011 00:11:50 +0100 Subject: implemented 3 different temporary designs for the breadcrumbs (through classes 'version01'-03) --- css/design.css | 55 ++++++++++++++++++++++++++++++++++++++++++++++++------- main.php | 2 +- 2 files changed, 49 insertions(+), 8 deletions(-) diff --git a/css/design.css b/css/design.css index 984582459..aaf2a40a9 100755 --- a/css/design.css +++ b/css/design.css @@ -224,31 +224,72 @@ /*____________ breadcrumbs ____________*/ -.dokuwiki div.breadcrumbs { +/* version01 */ + +.dokuwiki div.breadcrumbs.version01 { border-top: 1px solid __border__; border-bottom: 1px solid __background__; margin-bottom: .5em; font-size: 0.875em; clear: both; } -.dokuwiki div.breadcrumbs div { +.dokuwiki div.breadcrumbs.version01 div { padding: .1em .35em; } -.dokuwiki div.breadcrumbs div:only-child { +.dokuwiki div.breadcrumbs.version01 div:only-child { border-top: 1px solid __background__; border-bottom: 1px solid __border__; } -.dokuwiki div.breadcrumbs div:first-child { +.dokuwiki div.breadcrumbs.version01 div:first-child { border-top: 1px solid __background__; } -#IE7 .dokuwiki div.breadcrumbs div, -#IE8 .dokuwiki div.breadcrumbs div { +#IE7 .dokuwiki div.breadcrumbs.version01 div, +#IE8 .dokuwiki div.breadcrumbs.version01 div { + border-bottom: 1px solid __border__; +} +.dokuwiki div.breadcrumbs.version01 div:last-child { border-bottom: 1px solid __border__; } -.dokuwiki div.breadcrumbs div:last-child { + +/* version02 */ + +.dokuwiki div.breadcrumbs.version02 { + border-bottom: 1px solid __background__; + margin-bottom: .5em; + padding: .1em 0; + font-size: 0.875em; + clear: both; +} + +.dokuwiki div.breadcrumbs.version02 div { + padding: .1em 0; +} + +.dokuwiki div.breadcrumbs.version02 div:only-child, +.dokuwiki div.breadcrumbs.version02 div:last-child { border-bottom: 1px solid __border__; } +#IE7 .dokuwiki div.breadcrumbs.version02 div, +#IE8 .dokuwiki div.breadcrumbs.version02 div { + border-bottom: 1px solid __border__; +} + +/* version03 */ + +.dokuwiki div.breadcrumbs.version03 { + border: 1px solid __border__; + padding: .1em .35em; + -moz-box-shadow: inset 0 0 1px __background_alt__; + -webkit-box-shadow: inset 0 0 1px __background_alt__; + box-shadow: inset 0 0 1px __background_alt__; + border-radius: 2px; + background-color: #fdfdfd; + margin-bottom: .5em; + font-size: 0.875em; + clear: both; +} + .dokuwiki div.breadcrumbs a { color: __link__; diff --git a/main.php b/main.php index 2d243a950..d5c1cceb6 100755 --- a/main.php +++ b/main.php @@ -91,7 +91,7 @@ $showTools = !tpl_getConf('hideTools') || ( tpl_getConf('hideTools') && $_SERVER -
+
-- cgit v1.2.3 From 5eb28b9b43c016282c096a6c08eb524e231174d4 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Wed, 5 Oct 2011 00:28:04 +0100 Subject: monospace font for main textarea --- css/basic.css | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/css/basic.css b/css/basic.css index ef4e3b272..51d1ed7ed 100755 --- a/css/basic.css +++ b/css/basic.css @@ -292,6 +292,10 @@ option { font-style: normal; font-weight: normal; } border: 1px solid #ccc; border-radius: 2px; } +.dokuwiki textarea.edit { + font-family: Consolas, "Andale Mono WT", "Andale Mono", "Bitstream Vera Sans Mono", "Liberation Mono", Monaco, "Courier New", monospace; +} + /*____________ general classes ____________*/ -- cgit v1.2.3 From 7ccc11464f838bd1beb3681efc3b31c29ca620c3 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Wed, 5 Oct 2011 00:28:26 +0100 Subject: improvements for the pagetools --- css/design.css | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/css/design.css b/css/design.css index aaf2a40a9..904868024 100755 --- a/css/design.css +++ b/css/design.css @@ -104,10 +104,18 @@ /*____________ page tools ____________*/ +#dokuwiki__site .site { + padding-left: 40px; + padding-right: 40px; +} +#dokuwiki__usertools { + right: 40px; +} + #dokuwiki__pagetools { position: absolute; - right: -33px; - top: 1em; + right: -37px; + top: 2em; font-size: 90%; } @@ -120,7 +128,7 @@ right: 0; width: 32px; overflow: hidden; - border: 1px solid __background_alt__; + border: 1px solid __border__; border-radius: 2px; text-align: right; margin: 0; @@ -133,6 +141,7 @@ #dokuwiki__pagetools:active ul, #dokuwiki__pagetools:focus ul { width: auto; + box-shadow: 0 0 .3em #666; } #dokuwiki__pagetools ul li { @@ -342,7 +351,7 @@ .dokuwiki .pageId { position: absolute; top: -1.5em; - right: 1em; + right: 0; font-size: 0.875em; border: solid __background_alt__; border-width: 1px 1px 0; -- cgit v1.2.3 From 35cc0740c8dab662e9b46b94e188a72536bbd7c2 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Wed, 5 Oct 2011 00:51:22 +0100 Subject: implemented different temporary design for pagetools on the left (class='version02' instead of 01) --- css/design.css | 26 ++++++++++++++++++++------ main.php | 2 +- 2 files changed, 21 insertions(+), 7 deletions(-) diff --git a/css/design.css b/css/design.css index 904868024..ee3eced43 100755 --- a/css/design.css +++ b/css/design.css @@ -114,9 +114,17 @@ #dokuwiki__pagetools { position: absolute; + font-size: 90%; +} + +#dokuwiki__pagetools.version01 { right: -37px; top: 2em; - font-size: 90%; +} +#dokuwiki__pagetools.version02 { + left: __sidebar_width__; + top: 2em; + margin-left: -1.2em; } #dokuwiki__pagetools div.tools { @@ -125,17 +133,23 @@ #dokuwiki__pagetools ul { position: absolute; - right: 0; width: 32px; overflow: hidden; border: 1px solid __border__; border-radius: 2px; - text-align: right; margin: 0; padding: 0; background-color: __background__; color: inherit; } +#dokuwiki__pagetools.version01 ul { + right: 0; + text-align: right; +} +#dokuwiki__pagetools.version02 ul { + left: 0; + text-align: left; +} #dokuwiki__pagetools:hover ul, #dokuwiki__pagetools:active ul, @@ -163,9 +177,9 @@ background-position: 10px center; } -#dokuwiki__pagetools:hover ul li a, -#dokuwiki__pagetools:active ul li a, -#dokuwiki__pagetools:focus ul li a { +#dokuwiki__pagetools.version01:hover ul li a, +#dokuwiki__pagetools.version01:active ul li a, +#dokuwiki__pagetools.version01:focus ul li a { padding-right: 32px; padding-left: 0; background-position: right center; diff --git a/main.php b/main.php index d5c1cceb6..44a650486 100755 --- a/main.php +++ b/main.php @@ -132,7 +132,7 @@ $showTools = !tpl_getConf('hideTools') || ( tpl_getConf('hideTools') && $_SERVER -
+

    -- cgit v1.2.3 From 0f4daa60300a2fe69bbb55dc99833c8d5ea389d2 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Wed, 5 Oct 2011 12:05:40 +0100 Subject: minor font-size fixes --- css/design.css | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/css/design.css b/css/design.css index ee3eced43..31d3b6ae5 100755 --- a/css/design.css +++ b/css/design.css @@ -114,7 +114,6 @@ #dokuwiki__pagetools { position: absolute; - font-size: 90%; } #dokuwiki__pagetools.version01 { @@ -162,6 +161,7 @@ padding: 4px 2px; margin: 0; list-style: none; + font-size: 0.875em; } #dokuwiki__pagetools:hover ul li, #dokuwiki__pagetools:active ul li, @@ -327,6 +327,8 @@ ********************************************************************/ #dokuwiki__aside { +} +#dokuwiki__aside .pad { line-height: 1.2; font-size: 0.875em; } @@ -388,10 +390,14 @@ /*____________ misc ____________*/ -/* license note in footer and under edit window */ +/* license note under edit window */ .dokuwiki div.license { font-size: 93.75%; } +/* license note in footer */ +.dokuwiki #dokuwiki__footer div.license { + font-size: 100%; +} #IE6 .dokuwiki input.button, #IE6 .dokuwiki button, #IE7 .dokuwiki input.button, #IE7 .dokuwiki button { @@ -441,6 +447,9 @@ #dokuwiki__footer { margin-bottom: 1em; } +#dokuwiki__footer .pad { + font-size: 0.875em; +} #IE6 #dokuwiki__footer, #IE7 #dokuwiki__footer { height: 1%; -- cgit v1.2.3 From 3ccc6a7cc6943af225694ca8975518d07035c165 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Wed, 5 Oct 2011 12:10:21 +0100 Subject: fixed position of second pagetool version --- css/design.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/css/design.css b/css/design.css index 31d3b6ae5..fec8b089a 100755 --- a/css/design.css +++ b/css/design.css @@ -123,7 +123,7 @@ #dokuwiki__pagetools.version02 { left: __sidebar_width__; top: 2em; - margin-left: -1.2em; + margin-left: -2.6em; } #dokuwiki__pagetools div.tools { -- cgit v1.2.3 From 245160af0d61d46cc60621b9edbeffa4272666ac Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Wed, 5 Oct 2011 12:46:07 +0100 Subject: added version03 for pagetools --- css/design.css | 45 ++++++++++++++++++++++++++++++++++++++------- 1 file changed, 38 insertions(+), 7 deletions(-) diff --git a/css/design.css b/css/design.css index fec8b089a..812585fa7 100755 --- a/css/design.css +++ b/css/design.css @@ -112,15 +112,13 @@ right: 40px; } -#dokuwiki__pagetools { - position: absolute; -} - #dokuwiki__pagetools.version01 { + position: absolute; right: -37px; top: 2em; } #dokuwiki__pagetools.version02 { + position: absolute; left: __sidebar_width__; top: 2em; margin-left: -2.6em; @@ -150,6 +148,7 @@ text-align: left; } + #dokuwiki__pagetools:hover ul, #dokuwiki__pagetools:active ul, #dokuwiki__pagetools:focus ul { @@ -163,12 +162,13 @@ list-style: none; font-size: 0.875em; } -#dokuwiki__pagetools:hover ul li, -#dokuwiki__pagetools:active ul li, -#dokuwiki__pagetools:focus ul li { +#dokuwiki__pagetools.version01:hover ul li, +#dokuwiki__pagetools.version01:active ul li, +#dokuwiki__pagetools.version01:focus ul li { padding: 4px 4px; } + #dokuwiki__pagetools ul li a { white-space: nowrap; background-repeat: no-repeat; @@ -185,6 +185,37 @@ background-position: right center; } + +#dokuwiki__pagetools.version03 { + position: fixed; + bottom: 0; + left: 0; + width: 100%; +} +#dokuwiki__pagetools.version03 div.tools { + position: static; + max-width: __site_width__; + margin: 0 auto; +} +#dokuwiki__pagetools.version03 ul { + position: static; + width: auto; + box-shadow: 0 0 .3em #666; + padding: .2em 40px; + margin-left: __sidebar_width__; +} +#dokuwiki__pagetools.version03 ul li { + display: inline; +} +#dokuwiki__pagetools.version03 ul li:first-child { + padding-left: 2em; +} +#dokuwiki__pagetools.version03 ul li a { + padding-left: 22px; + padding-right: 1em; + background-position: 0 center; +} + /* @todo: add NEW icons */ #dokuwiki__pagetools ul li a.edit { background-image: url(images/pagetools/pencil.png); -- cgit v1.2.3 From 2b654fc3afaef763a3d51b4e090255fdbaa27eb6 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Wed, 5 Oct 2011 14:23:26 +0100 Subject: added version04 for pagetools --- css/design.css | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/css/design.css b/css/design.css index 812585fa7..598bc548e 100755 --- a/css/design.css +++ b/css/design.css @@ -186,14 +186,21 @@ } -#dokuwiki__pagetools.version03 { +#dokuwiki__pagetools.version03, +#dokuwiki__pagetools.version04 { position: fixed; bottom: 0; - left: 0; width: 100%; } -#dokuwiki__pagetools.version03 div.tools { - position: static; +#dokuwiki__pagetools.version03 { + left: 0; +} +#dokuwiki__pagetools.version04 { + left: __sidebar_width__; +} +#dokuwiki__pagetools.version03 div.tools, +#dokuwiki__pagetools.version04 div.tools { + position: relative; max-width: __site_width__; margin: 0 auto; } @@ -204,6 +211,12 @@ padding: .2em 40px; margin-left: __sidebar_width__; } +#dokuwiki__pagetools.version04 ul { + position: absolute; + bottom: .2em; + left: -.2em; + padding: .2em; +} #dokuwiki__pagetools.version03 ul li { display: inline; } -- cgit v1.2.3 From 97687a1fe392e5abaf733f8148dfb5674bba0d1f Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Wed, 5 Oct 2011 14:34:08 +0100 Subject: added another temporary design for pagetools (version05) --- css/design.css | 29 +++++++++++++++++++++++++++-- 1 file changed, 27 insertions(+), 2 deletions(-) diff --git a/css/design.css b/css/design.css index 598bc548e..7c6f182b0 100755 --- a/css/design.css +++ b/css/design.css @@ -187,7 +187,8 @@ #dokuwiki__pagetools.version03, -#dokuwiki__pagetools.version04 { +#dokuwiki__pagetools.version04, +#dokuwiki__pagetools.version05 { position: fixed; bottom: 0; width: 100%; @@ -198,8 +199,12 @@ #dokuwiki__pagetools.version04 { left: __sidebar_width__; } +#dokuwiki__pagetools.version05 { + right: 0; +} #dokuwiki__pagetools.version03 div.tools, -#dokuwiki__pagetools.version04 div.tools { +#dokuwiki__pagetools.version04 div.tools, +#dokuwiki__pagetools.version05 div.tools { position: relative; max-width: __site_width__; margin: 0 auto; @@ -217,6 +222,13 @@ left: -.2em; padding: .2em; } +#dokuwiki__pagetools.version05 ul { + position: absolute; + bottom: .2em; + right: -.2em; + padding: .2em; + text-align: right; +} #dokuwiki__pagetools.version03 ul li { display: inline; } @@ -229,6 +241,19 @@ background-position: 0 center; } +#dokuwiki__pagetools.version05:hover ul li, +#dokuwiki__pagetools.version05:active ul li, +#dokuwiki__pagetools.version05:focus ul li { + padding: 4px 4px; +} +#dokuwiki__pagetools.version05:hover ul li a, +#dokuwiki__pagetools.version05:active ul li a, +#dokuwiki__pagetools.version05:focus ul li a { + padding-right: 32px; + padding-left: 0; + background-position: right center; +} + /* @todo: add NEW icons */ #dokuwiki__pagetools ul li a.edit { background-image: url(images/pagetools/pencil.png); -- cgit v1.2.3 From c161660b125f0f6369853e450c4e82daa2866cec Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Wed, 5 Oct 2011 15:16:46 +0100 Subject: minor fix for version02 of breadcrumbs --- css/design.css | 1 - 1 file changed, 1 deletion(-) diff --git a/css/design.css b/css/design.css index 7c6f182b0..db3cb06fa 100755 --- a/css/design.css +++ b/css/design.css @@ -349,7 +349,6 @@ .dokuwiki div.breadcrumbs.version02 { border-bottom: 1px solid __background__; margin-bottom: .5em; - padding: .1em 0; font-size: 0.875em; clear: both; } -- cgit v1.2.3 From aca3c92b68a6e2ae7acfba3388e69e614eb8f10a Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Wed, 5 Oct 2011 18:28:02 +0100 Subject: added alternative designs for breadcrumbs (version04-07) --- css/design.css | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/css/design.css b/css/design.css index db3cb06fa..38e33347b 100755 --- a/css/design.css +++ b/css/design.css @@ -381,6 +381,52 @@ clear: both; } +.dokuwiki div.breadcrumbs.version04 { + padding: .1em .35em; + box-shadow: inset 0 0 .3em __background_alt__; + border-radius: 2px; + background-color: #fdfdfd; + margin-bottom: .5em; + font-size: 0.875em; + clear: both; +} + +.dokuwiki div.breadcrumbs.version05 { + padding: .1em .35em; + border-radius: 2px; + background-color: #fdfdfd; + background-image: -moz-linear-gradient( left, #fff 0%, #eee 50%, #fff 100%); + background-image: -webkit-linear-gradient(left, #fff 0%, #eee 50%, #fff 100%); + background-image: -o-linear-gradient( left, #fff 0%, #eee 50%, #fff 100%); + background-image: -ms-linear-gradient( left, #fff 0%, #eee 50%, #fff 100%); + background-image: linear-gradient( left, #fff 0%, #eee 50%, #fff 100%); + margin-bottom: .5em; + font-size: 0.875em; + clear: both; +} + +.dokuwiki div.breadcrumbs.version06 { + padding: .1em .35em; + border-radius: 2px; + background-color: #fdfdfd; + background-image: -moz-linear-gradient( left, #f3f3f3 0%, #fff 100%); + background-image: -webkit-linear-gradient(left, #f3f3f3 0%, #fff 100%); + background-image: -o-linear-gradient( left, #f3f3f3 0%, #fff 100%); + background-image: -ms-linear-gradient( left, #f3f3f3 0%, #fff 100%); + background-image: linear-gradient( left, #f3f3f3 0%, #fff 100%); + margin-bottom: .5em; + font-size: 0.875em; + clear: both; +} + +.dokuwiki div.breadcrumbs.version07 { + padding: .1em .35em; + border-radius: 2px; + background-color: #fdfdfd; + margin-bottom: .5em; + font-size: 0.875em; + clear: both; +} .dokuwiki div.breadcrumbs a { color: __link__; -- cgit v1.2.3 From 1c9d0146758fb2c90743603badce2ab63e27caa2 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Wed, 5 Oct 2011 19:51:53 +0100 Subject: removed all alternative versions of breadcrumbs and pagetools --- css/design.css | 195 +++++---------------------------------------------------- main.php | 2 +- 2 files changed, 15 insertions(+), 182 deletions(-) diff --git a/css/design.css b/css/design.css index 38e33347b..1df64741f 100755 --- a/css/design.css +++ b/css/design.css @@ -112,17 +112,11 @@ right: 40px; } -#dokuwiki__pagetools.version01 { +#dokuwiki__pagetools { position: absolute; right: -37px; top: 2em; } -#dokuwiki__pagetools.version02 { - position: absolute; - left: __sidebar_width__; - top: 2em; - margin-left: -2.6em; -} #dokuwiki__pagetools div.tools { position: fixed; @@ -138,16 +132,9 @@ padding: 0; background-color: __background__; color: inherit; -} -#dokuwiki__pagetools.version01 ul { right: 0; text-align: right; } -#dokuwiki__pagetools.version02 ul { - left: 0; - text-align: left; -} - #dokuwiki__pagetools:hover ul, #dokuwiki__pagetools:active ul, @@ -162,9 +149,9 @@ list-style: none; font-size: 0.875em; } -#dokuwiki__pagetools.version01:hover ul li, -#dokuwiki__pagetools.version01:active ul li, -#dokuwiki__pagetools.version01:focus ul li { +#dokuwiki__pagetools:hover ul li, +#dokuwiki__pagetools:active ul li, +#dokuwiki__pagetools:focus ul li { padding: 4px 4px; } @@ -177,83 +164,15 @@ background-position: 10px center; } -#dokuwiki__pagetools.version01:hover ul li a, -#dokuwiki__pagetools.version01:active ul li a, -#dokuwiki__pagetools.version01:focus ul li a { +#dokuwiki__pagetools:hover ul li a, +#dokuwiki__pagetools:active ul li a, +#dokuwiki__pagetools:focus ul li a { padding-right: 32px; padding-left: 0; background-position: right center; } -#dokuwiki__pagetools.version03, -#dokuwiki__pagetools.version04, -#dokuwiki__pagetools.version05 { - position: fixed; - bottom: 0; - width: 100%; -} -#dokuwiki__pagetools.version03 { - left: 0; -} -#dokuwiki__pagetools.version04 { - left: __sidebar_width__; -} -#dokuwiki__pagetools.version05 { - right: 0; -} -#dokuwiki__pagetools.version03 div.tools, -#dokuwiki__pagetools.version04 div.tools, -#dokuwiki__pagetools.version05 div.tools { - position: relative; - max-width: __site_width__; - margin: 0 auto; -} -#dokuwiki__pagetools.version03 ul { - position: static; - width: auto; - box-shadow: 0 0 .3em #666; - padding: .2em 40px; - margin-left: __sidebar_width__; -} -#dokuwiki__pagetools.version04 ul { - position: absolute; - bottom: .2em; - left: -.2em; - padding: .2em; -} -#dokuwiki__pagetools.version05 ul { - position: absolute; - bottom: .2em; - right: -.2em; - padding: .2em; - text-align: right; -} -#dokuwiki__pagetools.version03 ul li { - display: inline; -} -#dokuwiki__pagetools.version03 ul li:first-child { - padding-left: 2em; -} -#dokuwiki__pagetools.version03 ul li a { - padding-left: 22px; - padding-right: 1em; - background-position: 0 center; -} - -#dokuwiki__pagetools.version05:hover ul li, -#dokuwiki__pagetools.version05:active ul li, -#dokuwiki__pagetools.version05:focus ul li { - padding: 4px 4px; -} -#dokuwiki__pagetools.version05:hover ul li a, -#dokuwiki__pagetools.version05:active ul li a, -#dokuwiki__pagetools.version05:focus ul li a { - padding-right: 32px; - padding-left: 0; - background-position: right center; -} - /* @todo: add NEW icons */ #dokuwiki__pagetools ul li a.edit { background-image: url(images/pagetools/pencil.png); @@ -316,118 +235,32 @@ /*____________ breadcrumbs ____________*/ -/* version01 */ - -.dokuwiki div.breadcrumbs.version01 { +.dokuwiki div.breadcrumbs { border-top: 1px solid __border__; border-bottom: 1px solid __background__; margin-bottom: .5em; font-size: 0.875em; clear: both; } -.dokuwiki div.breadcrumbs.version01 div { +.dokuwiki div.breadcrumbs div { padding: .1em .35em; } -.dokuwiki div.breadcrumbs.version01 div:only-child { +.dokuwiki div.breadcrumbs div:only-child { border-top: 1px solid __background__; border-bottom: 1px solid __border__; } -.dokuwiki div.breadcrumbs.version01 div:first-child { +.dokuwiki div.breadcrumbs div:first-child { border-top: 1px solid __background__; } -#IE7 .dokuwiki div.breadcrumbs.version01 div, -#IE8 .dokuwiki div.breadcrumbs.version01 div { +#IE7 .dokuwiki div.breadcrumbs div, +#IE8 .dokuwiki div.breadcrumbs div { border-bottom: 1px solid __border__; } -.dokuwiki div.breadcrumbs.version01 div:last-child { +.dokuwiki div.breadcrumbs div:last-child { border-bottom: 1px solid __border__; } -/* version02 */ - -.dokuwiki div.breadcrumbs.version02 { - border-bottom: 1px solid __background__; - margin-bottom: .5em; - font-size: 0.875em; - clear: both; -} - -.dokuwiki div.breadcrumbs.version02 div { - padding: .1em 0; -} - -.dokuwiki div.breadcrumbs.version02 div:only-child, -.dokuwiki div.breadcrumbs.version02 div:last-child { - border-bottom: 1px solid __border__; -} -#IE7 .dokuwiki div.breadcrumbs.version02 div, -#IE8 .dokuwiki div.breadcrumbs.version02 div { - border-bottom: 1px solid __border__; -} - -/* version03 */ - -.dokuwiki div.breadcrumbs.version03 { - border: 1px solid __border__; - padding: .1em .35em; - -moz-box-shadow: inset 0 0 1px __background_alt__; - -webkit-box-shadow: inset 0 0 1px __background_alt__; - box-shadow: inset 0 0 1px __background_alt__; - border-radius: 2px; - background-color: #fdfdfd; - margin-bottom: .5em; - font-size: 0.875em; - clear: both; -} - -.dokuwiki div.breadcrumbs.version04 { - padding: .1em .35em; - box-shadow: inset 0 0 .3em __background_alt__; - border-radius: 2px; - background-color: #fdfdfd; - margin-bottom: .5em; - font-size: 0.875em; - clear: both; -} - -.dokuwiki div.breadcrumbs.version05 { - padding: .1em .35em; - border-radius: 2px; - background-color: #fdfdfd; - background-image: -moz-linear-gradient( left, #fff 0%, #eee 50%, #fff 100%); - background-image: -webkit-linear-gradient(left, #fff 0%, #eee 50%, #fff 100%); - background-image: -o-linear-gradient( left, #fff 0%, #eee 50%, #fff 100%); - background-image: -ms-linear-gradient( left, #fff 0%, #eee 50%, #fff 100%); - background-image: linear-gradient( left, #fff 0%, #eee 50%, #fff 100%); - margin-bottom: .5em; - font-size: 0.875em; - clear: both; -} - -.dokuwiki div.breadcrumbs.version06 { - padding: .1em .35em; - border-radius: 2px; - background-color: #fdfdfd; - background-image: -moz-linear-gradient( left, #f3f3f3 0%, #fff 100%); - background-image: -webkit-linear-gradient(left, #f3f3f3 0%, #fff 100%); - background-image: -o-linear-gradient( left, #f3f3f3 0%, #fff 100%); - background-image: -ms-linear-gradient( left, #f3f3f3 0%, #fff 100%); - background-image: linear-gradient( left, #f3f3f3 0%, #fff 100%); - margin-bottom: .5em; - font-size: 0.875em; - clear: both; -} - -.dokuwiki div.breadcrumbs.version07 { - padding: .1em .35em; - border-radius: 2px; - background-color: #fdfdfd; - margin-bottom: .5em; - font-size: 0.875em; - clear: both; -} - .dokuwiki div.breadcrumbs a { color: __link__; background-color: inherit; diff --git a/main.php b/main.php index 44a650486..fc87ede6f 100755 --- a/main.php +++ b/main.php @@ -91,7 +91,7 @@ $showTools = !tpl_getConf('hideTools') || ( tpl_getConf('hideTools') && $_SERVER -
    +
    -- cgit v1.2.3 From c2fe893268910fa0ecbf3f8223aaf36c8ff3dbc2 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Wed, 5 Oct 2011 19:55:52 +0100 Subject: repositioned breadcrumbs a bit (more space above, less space below) --- css/design.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/css/design.css b/css/design.css index 1df64741f..0d7dfd961 100755 --- a/css/design.css +++ b/css/design.css @@ -11,12 +11,12 @@ ********************************************************************/ #dokuwiki__header { - padding: 2em 0; + padding: 2em 0 1.5em; } #dokuwiki__header .headings, #dokuwiki__header .tools { - margin-bottom: 1em; + margin-bottom: 1.5em; width: 49%; } #dokuwiki__header h1 img { -- cgit v1.2.3 From 31b36f78db9413c0200a499e9ffe29899e69309f Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Wed, 5 Oct 2011 20:08:56 +0100 Subject: split footer into two bits --- css/design.css | 18 ++++++------------ css/structure.css | 5 ----- main.php | 3 ++- 3 files changed, 8 insertions(+), 18 deletions(-) diff --git a/css/design.css b/css/design.css index 0d7dfd961..459450cec 100755 --- a/css/design.css +++ b/css/design.css @@ -332,7 +332,11 @@ box-shadow: 0 0 .5em #999; border-radius: 2px; padding: 2em; + margin-bottom: 1em; +} +.dokuwiki .docInfo { + font-size: 0.875em; } /*____________ misc ____________*/ @@ -397,18 +401,8 @@ #dokuwiki__footer .pad { font-size: 0.875em; } -#IE6 #dokuwiki__footer, -#IE7 #dokuwiki__footer { - height: 1%; -} -#dokuwiki__footer .doc { - float: left; -} -#dokuwiki__footer .top { - float: right; -} -#dokuwiki__footer .license { - clear: both; +#dokuwiki__footer div.license { + text-align: center; } #dokuwiki__footer .license img { margin: 0 .5em 0 0; diff --git a/css/structure.css b/css/structure.css index 7de4401d7..ea64f4867 100755 --- a/css/structure.css +++ b/css/structure.css @@ -31,10 +31,6 @@ body { #dokuwiki__site .wrapper { position: relative; } -#IE6 #dokuwiki__site .wrapper, -#IE7 #dokuwiki__site .wrapper { - height: 1%; -} #dokuwiki__aside { width: __sidebar_width__; @@ -57,7 +53,6 @@ body { #dokuwiki__footer { clear: both; - margin-left: __sidebar_width__; } #dokuwiki__footer .pad { } diff --git a/main.php b/main.php index fc87ede6f..41d9347fd 100755 --- a/main.php +++ b/main.php @@ -124,6 +124,8 @@ $showTools = !tpl_getConf('hideTools') || ( tpl_getConf('hideTools') && $_SERVER
    +
    +
@@ -152,7 +154,6 @@ $showTools = !tpl_getConf('hideTools') || ( tpl_getConf('hideTools') && $_SERVER
-
-- cgit v1.2.3 From e63733c3d1c99354dab2e61a96920bccc29c7f72 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Wed, 5 Oct 2011 20:17:00 +0100 Subject: minor design changes for the page footer --- css/design.css | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/css/design.css b/css/design.css index 459450cec..19c64be2a 100755 --- a/css/design.css +++ b/css/design.css @@ -332,11 +332,12 @@ box-shadow: 0 0 .5em #999; border-radius: 2px; padding: 2em; - margin-bottom: 1em; + margin-bottom: .5em; } .dokuwiki .docInfo { font-size: 0.875em; + text-align: right; } /*____________ misc ____________*/ -- cgit v1.2.3 From 5f153e6cbdbdd4632e7f0ffd57ed90c32cbcf33e Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Wed, 5 Oct 2011 20:17:34 +0100 Subject: switched back order of breadcrumbs --- main.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/main.php b/main.php index 41d9347fd..367fd5e7f 100755 --- a/main.php +++ b/main.php @@ -92,12 +92,12 @@ $showTools = !tpl_getConf('hideTools') || ( tpl_getConf('hideTools') && $_SERVER
- -
-
+ +
+
-- cgit v1.2.3 From 0ef918b64a54c170d4b6621a297b19de6a11749c Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Thu, 6 Oct 2011 11:35:41 +0100 Subject: added missing icons (and moved revert action higher up) --- css/design.css | 3 +++ images/pagetools/pencil_add.png | Bin 0 -> 742 bytes images/pagetools/site_backup_and_restore.png | Bin 0 -> 745 bytes main.php | 2 +- 4 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 images/pagetools/pencil_add.png create mode 100644 images/pagetools/site_backup_and_restore.png diff --git a/css/design.css b/css/design.css index 19c64be2a..4259e6071 100755 --- a/css/design.css +++ b/css/design.css @@ -186,6 +186,9 @@ #dokuwiki__pagetools ul li a.draft { background-image: url(images/pagetools/inbox-document-text.png); } +#dokuwiki__pagetools ul li a.revert { + background-image: url(images/pagetools/site_backup_and_restore.png); +} #dokuwiki__pagetools ul li a.source { background-image: url(images/pagetools/page_code.png); } diff --git a/images/pagetools/pencil_add.png b/images/pagetools/pencil_add.png new file mode 100644 index 000000000..edbebeed0 Binary files /dev/null and b/images/pagetools/pencil_add.png differ diff --git a/images/pagetools/site_backup_and_restore.png b/images/pagetools/site_backup_and_restore.png new file mode 100644 index 000000000..467e441b0 Binary files /dev/null and b/images/pagetools/site_backup_and_restore.png differ diff --git a/main.php b/main.php index 367fd5e7f..91e012b1b 100755 --- a/main.php +++ b/main.php @@ -140,10 +140,10 @@ $showTools = !tpl_getConf('hideTools') || ( tpl_getConf('hideTools') && $_SERVER
-- cgit v1.2.3 From c767156255555eb73bc3f80833ca0cb4026491fe Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Mon, 10 Oct 2011 18:39:56 +0100 Subject: improved page tools design, added 4 main icons, implemented 3 different temporary versions (version01-03) --- css/design.css | 111 +++++++++++++++++++++++------------ images/pagetools/backlink-active.png | Bin 0 -> 611 bytes images/pagetools/backlink.png | Bin 0 -> 514 bytes images/pagetools/edit-active.png | Bin 0 -> 654 bytes images/pagetools/edit.png | Bin 0 -> 552 bytes images/pagetools/revs-active.png | Bin 0 -> 813 bytes images/pagetools/revs.png | Bin 0 -> 717 bytes images/pagetools/top-active.png | Bin 0 -> 609 bytes images/pagetools/top.png | Bin 0 -> 528 bytes main.php | 12 ++-- 10 files changed, 79 insertions(+), 44 deletions(-) create mode 100644 images/pagetools/backlink-active.png create mode 100644 images/pagetools/backlink.png create mode 100644 images/pagetools/edit-active.png create mode 100644 images/pagetools/edit.png create mode 100644 images/pagetools/revs-active.png create mode 100644 images/pagetools/revs.png create mode 100644 images/pagetools/top-active.png create mode 100644 images/pagetools/top.png diff --git a/css/design.css b/css/design.css index 4259e6071..66ee6fbae 100755 --- a/css/design.css +++ b/css/design.css @@ -114,7 +114,7 @@ #dokuwiki__pagetools { position: absolute; - right: -37px; + right: -42px; top: 2em; } @@ -124,58 +124,76 @@ #dokuwiki__pagetools ul { position: absolute; - width: 32px; - overflow: hidden; - border: 1px solid __border__; - border-radius: 2px; + right: 0; margin: 0; padding: 0; - background-color: __background__; - color: inherit; - right: 0; text-align: right; } -#dokuwiki__pagetools:hover ul, -#dokuwiki__pagetools:active ul, -#dokuwiki__pagetools:focus ul { - width: auto; - box-shadow: 0 0 .3em #666; +#dokuwiki__pagetools.version03 ul { + border: 1px solid __border__; + border-radius: 2px; + background-color: __background__; + box-shadow: .1em .1em .1em __text__; + margin: 0 -.5em; +} +#dokuwiki__pagetools.version03:hover ul li a span, +#dokuwiki__pagetools.version03:active ul li a span, +#dokuwiki__pagetools.version03:focus ul li a span { + display: inline; } + #dokuwiki__pagetools ul li { - padding: 4px 2px; + padding: 0; margin: 0; list-style: none; font-size: 0.875em; } -#dokuwiki__pagetools:hover ul li, -#dokuwiki__pagetools:active ul li, -#dokuwiki__pagetools:focus ul li { - padding: 4px 4px; -} - #dokuwiki__pagetools ul li a { - white-space: nowrap; + display: block; + min-height: 17px; + padding: .5em 34px .5em 1em; background-repeat: no-repeat; - padding-right: 0; - padding-left: 32px; - background-position: 10px center; -} - -#dokuwiki__pagetools:hover ul li a, -#dokuwiki__pagetools:active ul li a, -#dokuwiki__pagetools:focus ul li a { - padding-right: 32px; - padding-left: 0; background-position: right center; + white-space: nowrap; + border: 1px solid transparent; } +#dokuwiki__pagetools.version02 ul li a { + padding: .2em 34px .2em .5em; +} +#dokuwiki__pagetools.version03 ul li a { + padding: .2em 34px .2em .5em; +} +#dokuwiki__pagetools.version01 ul li a:hover, +#dokuwiki__pagetools.version01 ul li a:active, +#dokuwiki__pagetools.version01 ul li a:focus { + border-radius: 2px; + background-color: __background__; + box-shadow: .1em .1em .1em __text__; + text-decoration: none; + border-color: __border__; +} +#dokuwiki__pagetools ul li a span { + display: none; +} +#dokuwiki__pagetools.version01 ul li a:hover span, +#dokuwiki__pagetools.version01 ul li a:active span, +#dokuwiki__pagetools.version01 ul li a:focus span { + display: inline; +} + /* @todo: add NEW icons */ #dokuwiki__pagetools ul li a.edit { - background-image: url(images/pagetools/pencil.png); + background-image: url(images/pagetools/edit.png); +} +#dokuwiki__pagetools ul li a.edit:hover, +#dokuwiki__pagetools ul li a.edit:active, +#dokuwiki__pagetools ul li a.edit:focus { + background-image: url(images/pagetools/edit-active.png); } #dokuwiki__pagetools ul li a.show { background-image: url(images/pagetools/page.png); @@ -183,26 +201,43 @@ #dokuwiki__pagetools ul li a.create { background-image: url(images/pagetools/pencil_add.png); } +#dokuwiki__pagetools ul li a.source { + background-image: url(images/pagetools/page_code.png); +} #dokuwiki__pagetools ul li a.draft { background-image: url(images/pagetools/inbox-document-text.png); } #dokuwiki__pagetools ul li a.revert { background-image: url(images/pagetools/site_backup_and_restore.png); } -#dokuwiki__pagetools ul li a.source { - background-image: url(images/pagetools/page_code.png); -} #dokuwiki__pagetools ul li a.revs { - background-image: url(images/pagetools/time.png); + background-image: url(images/pagetools/revs.png); +} +#dokuwiki__pagetools ul li a.revs:hover, +#dokuwiki__pagetools ul li a.revs:active, +#dokuwiki__pagetools ul li a.revs:focus, +.mode_revisions #dokuwiki__pagetools ul li a.revs { + background-image: url(images/pagetools/revs-active.png); } #dokuwiki__pagetools ul li a.backlink { - background-image: url(images/pagetools/arrow_redo.png); + background-image: url(images/pagetools/backlink.png); +} +#dokuwiki__pagetools ul li a.backlink:hover, +#dokuwiki__pagetools ul li a.backlink:active, +#dokuwiki__pagetools ul li a.backlink:focus, +.mode_backlink #dokuwiki__pagetools ul li a.backlink { + background-image: url(images/pagetools/backlink-active.png); } #dokuwiki__pagetools ul li a.subscribe { background-image: url(images/pagetools/email_star.png); } #dokuwiki__pagetools ul li a.top { - background-image: url(images/pagetools/arrow_up.png); + background-image: url(images/pagetools/top.png); +} +#dokuwiki__pagetools ul li a.top:hover, +#dokuwiki__pagetools ul li a.top:active, +#dokuwiki__pagetools ul li a.top:focus { + background-image: url(images/pagetools/top-active.png); } diff --git a/images/pagetools/backlink-active.png b/images/pagetools/backlink-active.png new file mode 100644 index 000000000..9038de35b Binary files /dev/null and b/images/pagetools/backlink-active.png differ diff --git a/images/pagetools/backlink.png b/images/pagetools/backlink.png new file mode 100644 index 000000000..82bc7fd8a Binary files /dev/null and b/images/pagetools/backlink.png differ diff --git a/images/pagetools/edit-active.png b/images/pagetools/edit-active.png new file mode 100644 index 000000000..57c9c63f8 Binary files /dev/null and b/images/pagetools/edit-active.png differ diff --git a/images/pagetools/edit.png b/images/pagetools/edit.png new file mode 100644 index 000000000..572a379b4 Binary files /dev/null and b/images/pagetools/edit.png differ diff --git a/images/pagetools/revs-active.png b/images/pagetools/revs-active.png new file mode 100644 index 000000000..58ecaa021 Binary files /dev/null and b/images/pagetools/revs-active.png differ diff --git a/images/pagetools/revs.png b/images/pagetools/revs.png new file mode 100644 index 000000000..225daaf13 Binary files /dev/null and b/images/pagetools/revs.png differ diff --git a/images/pagetools/top-active.png b/images/pagetools/top-active.png new file mode 100644 index 000000000..9553896f2 Binary files /dev/null and b/images/pagetools/top-active.png differ diff --git a/images/pagetools/top.png b/images/pagetools/top.png new file mode 100644 index 000000000..82d6a8c06 Binary files /dev/null and b/images/pagetools/top.png differ diff --git a/main.php b/main.php index 91e012b1b..6f6933241 100755 --- a/main.php +++ b/main.php @@ -139,12 +139,12 @@ $showTools = !tpl_getConf('hideTools') || ( tpl_getConf('hideTools') && $_SERVER
    ', ''); + tpl_action('revert', 1, 'li', 0, '', ''); + tpl_action('history', 1, 'li', 0, '', ''); + tpl_action('backlink', 1, 'li', 0, '', ''); + tpl_action('subscribe', 1, 'li', 0, '', ''); + tpl_action('top', 1, 'li', 0, '', ''); ?>
-- cgit v1.2.3 From 72a2a0dac2c8e2acbee5073457976826a8ff53c7 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Mon, 10 Oct 2011 19:24:27 +0100 Subject: improved toc design --- css/_toc.css | 38 ++++++++++++++++++++++++-------------- images/toc-arrows.png | Bin 0 -> 366 bytes 2 files changed, 24 insertions(+), 14 deletions(-) create mode 100644 images/toc-arrows.png diff --git a/css/_toc.css b/css/_toc.css index 1462eb83f..8aaa060e8 100755 --- a/css/_toc.css +++ b/css/_toc.css @@ -10,10 +10,7 @@ .dokuwiki div.toc { float: right; margin: -2em -2em .5em 1.4em; - /* @todo: possible to make calculation sort of automatic? */ - /*width: 200px; __sidebar_width__ - margin-left */ width: __sidebar_width__; - font-size: 0.9em; border-left: 1px solid __border__; background: __background__; color: inherit; @@ -23,15 +20,30 @@ .dokuwiki div.tocheader { padding: 0.5em 1em; - margin-bottom: .2em; font-weight: bold; - /* - background-color: __background_alt__; - color: __text__; - */ + font-size: 0.875em; + letter-spacing: .05em; } -/* css arrow */ + +.dokuwiki .toc span.toc_open, +.dokuwiki .toc span.toc_close { + background: transparent url(images/toc-arrows.png) 0 0; + width: 8px; + height: 5px; + margin: .4em 0 0; + float: right; +} +.dokuwiki .toc span.toc_open { + background-position: 0 -5px; +} + +.dokuwiki .toc span.toc_open span, +.dokuwiki .toc span.toc_close span { + display: none; +} + +/* css arrow .dokuwiki .toc span.toc_open, .dokuwiki .toc span.toc_close { border: .4em solid __background__; @@ -51,15 +63,13 @@ margin-top: 0; border-bottom: .4em solid __text__; } +*/ /*____________ toc list ____________*/ .dokuwiki #toc__inside { - padding: 0.75em 1em 1.5em; - /* - background-color: __background_alt__; - color: __text__; - */ + font-size: 0.875em; + padding: .5em 1em 1em; } .dokuwiki #toc__inside ul { padding: 0 0 0 1.5em; diff --git a/images/toc-arrows.png b/images/toc-arrows.png new file mode 100644 index 000000000..d55253186 Binary files /dev/null and b/images/toc-arrows.png differ -- cgit v1.2.3 From ce96de477af5949363385363743fec84c931db7a Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Mon, 10 Oct 2011 19:33:18 +0100 Subject: fixed pageid to also have the drop shadow --- css/design.css | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/css/design.css b/css/design.css index 66ee6fbae..4660e4540 100755 --- a/css/design.css +++ b/css/design.css @@ -351,8 +351,12 @@ .dokuwiki .pageId { position: absolute; - top: -1.5em; - right: 0; + top: -2.3em; + right: -1em; + overflow: hidden; + padding: 1em 1em 0; +} +.dokuwiki .pageId span { font-size: 0.875em; border: solid __background_alt__; border-width: 1px 1px 0; @@ -361,6 +365,8 @@ padding: .1em .35em; border-top-left-radius: 2px; border-top-right-radius: 2px; + box-shadow: 0 0 .5em #999; + display: block; } .dokuwiki div.page { -- cgit v1.2.3 From e0dd04a6493f1b7f7133f75c08f9ea55ee8bd50a Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Fri, 14 Oct 2011 16:39:36 +0200 Subject: Added bcrypt support for password hashes This method require PHP 5.3+ it will fail otherwise! --- _test/cases/inc/auth_password.test.php | 5 ++++ inc/PassHash.class.php | 34 +++++++++++++++++++++++++ lib/plugins/config/settings/config.metadata.php | 2 +- 3 files changed, 40 insertions(+), 1 deletion(-) diff --git a/_test/cases/inc/auth_password.test.php b/_test/cases/inc/auth_password.test.php index 928552a14..6fe564e73 100644 --- a/_test/cases/inc/auth_password.test.php +++ b/_test/cases/inc/auth_password.test.php @@ -48,6 +48,11 @@ class auth_password_test extends UnitTestCase { } } + function test_bcrypt_self(){ + $hash = auth_cryptPassword('foobcrypt','bcrypt'); + $this->assertTrue(auth_verifyPassword('foobcrypt',$hash)); + } + function test_verifyPassword_nohash(){ $this->assertTrue(auth_verifyPassword('foo','$1$$n1rTiFE0nRifwV/43bVon/')); } diff --git a/inc/PassHash.class.php b/inc/PassHash.class.php index 31493c022..77f2115bd 100644 --- a/inc/PassHash.class.php +++ b/inc/PassHash.class.php @@ -47,6 +47,9 @@ class PassHash { }elseif(preg_match('/^md5\$(.{5})\$/',$hash,$m)){ $method = 'djangomd5'; $salt = $m[1]; + }elseif(preg_match('/^\$2a\$(.{2})\$/',$hash,$m)){ + $method = 'bcrypt'; + $salt = $hash; }elseif(substr($hash,0,6) == '{SSHA}'){ $method = 'ssha'; $salt = substr(base64_decode(substr($hash, 6)),20); @@ -379,4 +382,35 @@ class PassHash { return 'md5$'.$salt.'$'.md5($salt.$clear); } + + /** + * Passwordhashing method 'bcrypt' + * + * Uses a modified blowfish algorithm called eksblowfish + * This method works on PHP 5.3+ only and will throw an exception + * if the needed crypt support isn't available + * + * A full hash should be given as salt (starting with $a2$) or this + * will break. When no salt is given, the iteration count can be set + * through the $compute variable. + * + * @param string $clear - the clear text to hash + * @param string $salt - the salt to use, null for random + * @param int $compute - the iteration count (between 4 and 31) + * @returns string - hashed password + */ + public function hash_bcrypt($clear, $salt=null, $compute=8){ + if(!defined('CRYPT_BLOWFISH') || CRYPT_BLOWFISH != 1){ + throw new Exception('This PHP installation has no bcrypt support'); + } + + if(is_null($salt)){ + if($compute < 4 || $compute > 31) $compute = 8; + $salt = '$2a$'.str_pad($compute, 2, '0', STR_PAD_LEFT).'$'. + $this->gen_salt(22); + } + + return crypt($password, $salt); + } + } diff --git a/lib/plugins/config/settings/config.metadata.php b/lib/plugins/config/settings/config.metadata.php index 5f2c32ea7..ba14eb85a 100644 --- a/lib/plugins/config/settings/config.metadata.php +++ b/lib/plugins/config/settings/config.metadata.php @@ -123,7 +123,7 @@ $meta['_authentication'] = array('fieldset'); $meta['useacl'] = array('onoff'); $meta['autopasswd'] = array('onoff'); $meta['authtype'] = array('authtype'); -$meta['passcrypt'] = array('multichoice','_choices' => array('smd5','md5','apr1','sha1','ssha','crypt','mysql','my411','kmd5','pmd5','hmd5')); +$meta['passcrypt'] = array('multichoice','_choices' => array('smd5','md5','apr1','sha1','ssha','crypt','mysql','my411','kmd5','pmd5','hmd5','bcrypt')); $meta['defaultgroup']= array('string'); $meta['superuser'] = array('string'); $meta['manager'] = array('string'); -- cgit v1.2.3 From 5446f3ffde77013d4eaea1fb166bcbd905a777a4 Mon Sep 17 00:00:00 2001 From: Dominik Eckelmann Date: Sat, 22 Oct 2011 16:01:07 +0200 Subject: use correct phpdoc @return tag. --- inc/auth.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/inc/auth.php b/inc/auth.php index eff984b36..a52c14731 100644 --- a/inc/auth.php +++ b/inc/auth.php @@ -422,7 +422,7 @@ function auth_isadmin($user=null,$groups=null){ * @param $memberlist string commaseparated list of allowed users and groups * @param $user string user to match against * @param $groups array groups the user is member of - * @returns bool true for membership acknowledged + * @return bool true for membership acknowledged */ function auth_isMember($memberlist,$user,array $groups){ global $auth; -- cgit v1.2.3 From cc204bbd1f1625352ddd0edaacdd297fe022881c Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Mon, 31 Oct 2011 15:41:53 +0100 Subject: honor autopasswd setting for resend password When autopasswd is disabled, the resend password option now asks for a new password instead of autogenerating a new one and sending it by mail. Note to translators: the wording for btn_resendpwd and resendpwd changed to be more universal. English and German language files where updated - other languages need to be adjusted. Conflicts: inc/lang/en/lang.php --- inc/auth.php | 42 +++++++++++++++++++++++++---------- inc/html.php | 51 +++++++++++++++++++++++++++++++------------ inc/lang/de-informal/lang.php | 4 ++-- inc/lang/de/lang.php | 4 ++-- inc/lang/en/lang.php | 4 ++-- inc/lang/en/resetpwd.txt | 4 ++++ 6 files changed, 78 insertions(+), 31 deletions(-) create mode 100644 inc/lang/en/resetpwd.txt diff --git a/inc/auth.php b/inc/auth.php index eff984b36..740a75a5c 100644 --- a/inc/auth.php +++ b/inc/auth.php @@ -852,32 +852,52 @@ function act_resendpwd(){ $token = preg_replace('/[^a-f0-9]+/','',$_REQUEST['pwauth']); if($token){ - // we're in token phase + // we're in token phase - get user info from token $tfile = $conf['cachedir'].'/'.$token{0}.'/'.$token.'.pwauth'; if(!@file_exists($tfile)){ msg($lang['resendpwdbadauth'],-1); + unset($_REQUEST['pwauth']); return false; } $user = io_readfile($tfile); - @unlink($tfile); $userinfo = $auth->getUserData($user); if(!$userinfo['mail']) { msg($lang['resendpwdnouser'], -1); return false; } - $pass = auth_pwgen(); - if (!$auth->triggerUserMod('modify', array($user,array('pass' => $pass)))) { - msg('error modifying user data',-1); - return false; - } - if (auth_sendPassword($user,$pass)) { - msg($lang['resendpwdsuccess'],1); - } else { - msg($lang['regmailfail'],-1); + if(!$conf['autopasswd']){ // we let the user choose a password + // password given correctly? + if(!isset($_REQUEST['pass']) || $_REQUEST['pass'] == '') return false; + if($_REQUEST['pass'] != $_REQUEST['passchk']){ + msg('password mismatch',-1); #FIXME localize + return false; + } + $pass = $_REQUEST['pass']; + + if (!$auth->triggerUserMod('modify', array($user,array('pass' => $pass)))) { + msg('error modifying user data',-1); + return false; + } + + }else{ // autogenerate the password and send by mail + + $pass = auth_pwgen(); + if (!$auth->triggerUserMod('modify', array($user,array('pass' => $pass)))) { + msg('error modifying user data',-1); + return false; + } + + if (auth_sendPassword($user,$pass)) { + msg($lang['resendpwdsuccess'],1); + } else { + msg($lang['regmailfail'],-1); + } } + + @unlink($tfile); return true; } else { diff --git a/inc/html.php b/inc/html.php index 1a2d7daef..dea9ac6ab 100644 --- a/inc/html.php +++ b/inc/html.php @@ -1661,26 +1661,49 @@ function html_admin(){ * Form to request a new password for an existing account * * @author Benoit Chesneau + * @author Andreas Gohr */ function html_resendpwd() { global $lang; global $conf; global $ID; - print p_locale_xhtml('resendpwd'); - print '
'.NL; - $form = new Doku_Form(array('id' => 'dw__resendpwd')); - $form->startFieldset($lang['resendpwd']); - $form->addHidden('do', 'resendpwd'); - $form->addHidden('save', '1'); - $form->addElement(form_makeTag('br')); - $form->addElement(form_makeTextField('login', $_POST['login'], $lang['user'], '', 'block')); - $form->addElement(form_makeTag('br')); - $form->addElement(form_makeTag('br')); - $form->addElement(form_makeButton('submit', '', $lang['btn_resendpwd'])); - $form->endFieldset(); - html_form('resendpwd', $form); - print '
'.NL; + $token = preg_replace('/[^a-f0-9]+/','',$_REQUEST['pwauth']); + + if(!$conf['autopasswd'] && $token){ + print p_locale_xhtml('resetpwd'); + print '
'.NL; + $form = new Doku_Form(array('id' => 'dw__resendpwd')); + $form->startFieldset($lang['btn_resendpwd']); + $form->addHidden('token', $token); + $form->addHidden('do', 'resendpwd'); + //$form->addElement(form_makeTag('br')); + + $form->addElement(form_makePasswordField('pass', $lang['pass'], '', 'block', array('size'=>'50'))); + $form->addElement(form_makePasswordField('passchk', $lang['passchk'], '', 'block', array('size'=>'50'))); + + $form->addElement(form_makeButton('submit', '', $lang['btn_resendpwd'])); + $form->endFieldset(); + html_form('resendpwd', $form); + print '
'.NL; + }else{ + print p_locale_xhtml('resendpwd'); + print '
'.NL; + $form = new Doku_Form(array('id' => 'dw__resendpwd')); + $form->startFieldset($lang['resendpwd']); + $form->addHidden('do', 'resendpwd'); + $form->addHidden('save', '1'); + $form->addElement(form_makeTag('br')); + $form->addElement(form_makeTextField('login', $_POST['login'], $lang['user'], '', 'block')); + $form->addElement(form_makeTag('br')); + $form->addElement(form_makeTag('br')); + $form->addElement(form_makeButton('submit', '', $lang['btn_resendpwd'])); + $form->endFieldset(); + html_form('resendpwd', $form); + print '
'.NL; + } + + } /** diff --git a/inc/lang/de-informal/lang.php b/inc/lang/de-informal/lang.php index ec5e308ce..74f3126a9 100644 --- a/inc/lang/de-informal/lang.php +++ b/inc/lang/de-informal/lang.php @@ -54,7 +54,7 @@ $lang['btn_backtomedia'] = 'Zurück zur Dateiauswahl'; $lang['btn_subscribe'] = 'Aboverwaltung'; $lang['btn_profile'] = 'Benutzerprofil'; $lang['btn_reset'] = 'Zurücksetzen'; -$lang['btn_resendpwd'] = 'Sende neues Passwort'; +$lang['btn_resendpwd'] = 'Setze neues Passwort'; $lang['btn_draft'] = 'Entwurf bearbeiten'; $lang['btn_recover'] = 'Entwurf wiederherstellen'; $lang['btn_draftdel'] = 'Entwurf löschen'; @@ -91,7 +91,7 @@ $lang['profnoempty'] = 'Es muss ein Name oder eine E-Mail Adresse ange $lang['profchanged'] = 'Benutzerprofil erfolgreich geändert.'; $lang['pwdforget'] = 'Passwort vergessen? Fordere ein neues an'; $lang['resendna'] = 'Passwörter versenden ist in diesem Wiki nicht möglich.'; -$lang['resendpwd'] = 'Neues Passwort senden für'; +$lang['resendpwd'] = 'Neues Passwort setzen für'; $lang['resendpwdmissing'] = 'Es tut mir Leid, aber du musst alle Felder ausfüllen.'; $lang['resendpwdnouser'] = 'Es tut mir Leid, aber der Benutzer existiert nicht in unserer Datenbank.'; $lang['resendpwdbadauth'] = 'Es tut mir Leid, aber dieser Authentifizierungscode ist ungültig. Stelle sicher, dass du den kompletten Bestätigungslink verwendet haben.'; diff --git a/inc/lang/de/lang.php b/inc/lang/de/lang.php index eef2f6632..e8e44287f 100644 --- a/inc/lang/de/lang.php +++ b/inc/lang/de/lang.php @@ -56,7 +56,7 @@ $lang['btn_backtomedia'] = 'Zurück zur Dateiauswahl'; $lang['btn_subscribe'] = 'Aboverwaltung'; $lang['btn_profile'] = 'Benutzerprofil'; $lang['btn_reset'] = 'Zurücksetzen'; -$lang['btn_resendpwd'] = 'Sende neues Passwort'; +$lang['btn_resendpwd'] = 'Setze neues Passwort'; $lang['btn_draft'] = 'Entwurf bearbeiten'; $lang['btn_recover'] = 'Entwurf wiederherstellen'; $lang['btn_draftdel'] = 'Entwurf löschen'; @@ -93,7 +93,7 @@ $lang['profnoempty'] = 'Es muss ein Name und eine E-Mail-Adresse angeg $lang['profchanged'] = 'Benutzerprofil erfolgreich geändert.'; $lang['pwdforget'] = 'Passwort vergessen? Fordere ein neues an'; $lang['resendna'] = 'Passwörter versenden ist in diesem Wiki nicht möglich.'; -$lang['resendpwd'] = 'Neues Passwort senden für'; +$lang['resendpwd'] = 'Neues Passwort setzen für'; $lang['resendpwdmissing'] = 'Es tut mir Leid, aber Sie müssen alle Felder ausfüllen.'; $lang['resendpwdnouser'] = 'Es tut mir Leid, aber der Benutzer existiert nicht in unserer Datenbank.'; $lang['resendpwdbadauth'] = 'Es tut mir Leid, aber dieser Authentifizierungscode ist ungültig. Stellen Sie sicher, dass Sie den kompletten Bestätigungslink verwendet haben.'; diff --git a/inc/lang/en/lang.php b/inc/lang/en/lang.php index 89a7c4d40..9d26a4957 100644 --- a/inc/lang/en/lang.php +++ b/inc/lang/en/lang.php @@ -43,7 +43,7 @@ $lang['btn_backtomedia'] = 'Back to Mediafile Selection'; $lang['btn_subscribe'] = 'Manage Subscriptions'; $lang['btn_profile'] = 'Update Profile'; $lang['btn_reset'] = 'Reset'; -$lang['btn_resendpwd'] = 'Send new password'; +$lang['btn_resendpwd'] = 'Set new password'; $lang['btn_draft'] = 'Edit draft'; $lang['btn_recover'] = 'Recover draft'; $lang['btn_draftdel'] = 'Delete draft'; @@ -84,7 +84,7 @@ $lang['profchanged'] = 'User profile successfully updated.'; $lang['pwdforget'] = 'Forgotten your password? Get a new one'; $lang['resendna'] = 'This wiki does not support password resending.'; -$lang['resendpwd'] = 'Send new password for'; +$lang['resendpwd'] = 'Set new password for'; $lang['resendpwdmissing'] = 'Sorry, you must fill in all fields.'; $lang['resendpwdnouser'] = 'Sorry, we can\'t find this user in our database.'; $lang['resendpwdbadauth'] = 'Sorry, this auth code is not valid. Make sure you used the complete confirmation link.'; diff --git a/inc/lang/en/resetpwd.txt b/inc/lang/en/resetpwd.txt new file mode 100644 index 000000000..993b48765 --- /dev/null +++ b/inc/lang/en/resetpwd.txt @@ -0,0 +1,4 @@ +====== Set new password ====== + +Please enter a new password for your account in this wiki. + -- cgit v1.2.3 From abb56b33e0993b3c6a7f114fbd074cc59626c394 Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Fri, 28 Oct 2011 14:24:56 +0200 Subject: Check password expiry times in Active Directory backend When a user logs in, the password expiry time is checked and compared to the $conf['auth']['ad']['expirywarn'] setting (in days). If the password is about to expire in the specified timeframe, a warning is issued on login. This patch adds a new method to the adLDAP class for querying domain parameters. --- inc/adLDAP.php | 20 ++++++++++++++++++++ inc/auth/ad.class.php | 28 +++++++++++++++++++++++----- 2 files changed, 43 insertions(+), 5 deletions(-) diff --git a/inc/adLDAP.php b/inc/adLDAP.php index a64096b85..24be6e475 100644 --- a/inc/adLDAP.php +++ b/inc/adLDAP.php @@ -1020,6 +1020,26 @@ class adLDAP { return (false); } + /** + * Return info about the domain itself + * + * @authot Andreas Gohr + * @param array $fields The fields to query + * @return array + */ + public function domain_info($fields){ + if (!$this->_bind){ return (false); } + + $sr = ldap_read($this->_conn, $this->_base_dn, 'objectclass=*', $fields); + if (!$sr) { + return false; + } + $info = ldap_get_entries($this->_conn, $sr); + if(count($info)) return $info[0]; + + return false; + } + /** * Determine a user's password expiry date * diff --git a/inc/auth/ad.class.php b/inc/auth/ad.class.php index 1fddad243..6b022d217 100644 --- a/inc/auth/ad.class.php +++ b/inc/auth/ad.class.php @@ -26,6 +26,8 @@ * $conf['auth']['ad']['use_ssl'] = 1; * $conf['auth']['ad']['use_tls'] = 1; * $conf['auth']['ad']['debug'] = 1; + * // warn user about expiring password in this mayn days in advance: + * $conf['auth']['ad']['expirywarn'] = 5; * * // get additional information to the userinfo array * // add a list of comma separated ldap contact fields. @@ -148,7 +150,7 @@ class auth_ad extends auth_basic { global $conf; if(!$this->_init()) return false; - $fields = array('mail','displayname','samaccountname'); + $fields = array('mail','displayname','samaccountname','lastpwd','pwdlastset','useraccountcontrol'); // add additional fields to read $fields = array_merge($fields, $this->cnf['additional']); @@ -157,10 +159,14 @@ class auth_ad extends auth_basic { //get info for given user $result = $this->adldap->user_info($user, $fields); //general user info - $info['name'] = $result[0]['displayname'][0]; - $info['mail'] = $result[0]['mail'][0]; - $info['uid'] = $result[0]['samaccountname'][0]; - $info['dn'] = $result[0]['dn']; + $info['name'] = $result[0]['displayname'][0]; + $info['mail'] = $result[0]['mail'][0]; + $info['uid'] = $result[0]['samaccountname'][0]; + $info['dn'] = $result[0]['dn']; + //last password set (Windows counts from January 1st 1601) + $info['lastpwd'] = $result[0]['pwdlastset'][0] / 10000000 - 11644473600; + //will it expire? + $info['expires'] = !($result[0]['useraccountcontrol'][0] & 0x10000); //ADS_UF_DONT_EXPIRE_PASSWD // additional information foreach ($this->cnf['additional'] as $field) { @@ -183,6 +189,18 @@ class auth_ad extends auth_basic { $info['grps'][] = $conf['defaultgroup']; } + // password will expire, let's warn the current user + if($_SERVER['REMOTE_USER'] == $user && $info['expires'] && $this->cnf['expirywarn']){ + $result = $this->adldap->domain_info(array('maxpwdage')); // maximum pass age + $maxage = -1 * $result['maxpwdage'][0] / 10000000; // negative 100 nanosecs + $timeleft = $maxage - (time() - $info['lastpwd']); + $timeleft = round($timeleft/(24*60*60)); + + if($timeleft <= $this->cnf['expirywarn']){ + msg('Your password will expire in '.$timeleft.' days. You should change it.'); + } + } + return $info; } -- cgit v1.2.3 From 22ffffcf6892924895d9ad45f749a307d05e09e0 Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Mon, 7 Nov 2011 14:15:29 +0100 Subject: always check expire time when configured --- inc/auth/ad.class.php | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/inc/auth/ad.class.php b/inc/auth/ad.class.php index 6b022d217..c3df2417b 100644 --- a/inc/auth/ad.class.php +++ b/inc/auth/ad.class.php @@ -189,14 +189,16 @@ class auth_ad extends auth_basic { $info['grps'][] = $conf['defaultgroup']; } - // password will expire, let's warn the current user - if($_SERVER['REMOTE_USER'] == $user && $info['expires'] && $this->cnf['expirywarn']){ + // check expiry time + if($info['expires'] && $this->cnf['expirywarn']){ $result = $this->adldap->domain_info(array('maxpwdage')); // maximum pass age $maxage = -1 * $result['maxpwdage'][0] / 10000000; // negative 100 nanosecs $timeleft = $maxage - (time() - $info['lastpwd']); $timeleft = round($timeleft/(24*60*60)); + $info['expiresin'] = $timeleft; - if($timeleft <= $this->cnf['expirywarn']){ + // if this is the current user, warn him + if( ($_SERVER['REMOTE_USER'] == $user) && ($timeleft <= $this->cnf['expirywarn'])){ msg('Your password will expire in '.$timeleft.' days. You should change it.'); } } -- cgit v1.2.3 From 7f99c819166c15279a3214e3439be8efb77f7021 Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Mon, 7 Nov 2011 14:31:09 +0100 Subject: do not query AD for empty user name --- inc/auth/ad.class.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/inc/auth/ad.class.php b/inc/auth/ad.class.php index c3df2417b..4363cfb07 100644 --- a/inc/auth/ad.class.php +++ b/inc/auth/ad.class.php @@ -150,6 +150,8 @@ class auth_ad extends auth_basic { global $conf; if(!$this->_init()) return false; + if($user == '') return array(); + $fields = array('mail','displayname','samaccountname','lastpwd','pwdlastset','useraccountcontrol'); // add additional fields to read -- cgit v1.2.3 From 9565908d97917c579e2ecb44a0b44a133df598fe Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Mon, 7 Nov 2011 14:36:23 +0100 Subject: Don't return any data for non-existant users --- inc/auth/ad.class.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/inc/auth/ad.class.php b/inc/auth/ad.class.php index 4363cfb07..678a32047 100644 --- a/inc/auth/ad.class.php +++ b/inc/auth/ad.class.php @@ -160,6 +160,10 @@ class auth_ad extends auth_basic { //get info for given user $result = $this->adldap->user_info($user, $fields); + if($result == false){ + return array(); + } + //general user info $info['name'] = $result[0]['displayname'][0]; $info['mail'] = $result[0]['mail'][0]; -- cgit v1.2.3 From b2117c6969fc31aa958f6019fd1e4e258f555db7 Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Mon, 7 Nov 2011 14:49:29 +0100 Subject: translatable AD expiry warning and link to update profile page --- inc/auth/ad.class.php | 5 +++-- inc/lang/de/lang.php | 1 + inc/lang/en/lang.php | 1 + 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/inc/auth/ad.class.php b/inc/auth/ad.class.php index 678a32047..cb59c5a48 100644 --- a/inc/auth/ad.class.php +++ b/inc/auth/ad.class.php @@ -26,7 +26,7 @@ * $conf['auth']['ad']['use_ssl'] = 1; * $conf['auth']['ad']['use_tls'] = 1; * $conf['auth']['ad']['debug'] = 1; - * // warn user about expiring password in this mayn days in advance: + * // warn user about expiring password this many days in advance: * $conf['auth']['ad']['expirywarn'] = 5; * * // get additional information to the userinfo array @@ -148,6 +148,7 @@ class auth_ad extends auth_basic { */ function getUserData($user){ global $conf; + global $lang; if(!$this->_init()) return false; if($user == '') return array(); @@ -205,7 +206,7 @@ class auth_ad extends auth_basic { // if this is the current user, warn him if( ($_SERVER['REMOTE_USER'] == $user) && ($timeleft <= $this->cnf['expirywarn'])){ - msg('Your password will expire in '.$timeleft.' days. You should change it.'); + msg(sprintf($lang['authpwdexpire'],$timeleft)); } } diff --git a/inc/lang/de/lang.php b/inc/lang/de/lang.php index eef2f6632..8fdffd66e 100644 --- a/inc/lang/de/lang.php +++ b/inc/lang/de/lang.php @@ -268,6 +268,7 @@ $lang['subscr_style_digest'] = 'Zusammenfassung der Änderungen für jede ver $lang['subscr_style_list'] = 'Liste der geänderten Seiten (Alle %.2f Tage)'; $lang['authmodfailed'] = 'Benutzerüberprüfung nicht möglich. Bitte wenden Sie sich an den Systembetreuer.'; $lang['authtempfail'] = 'Benutzerüberprüfung momentan nicht möglich. Falls das Problem andauert, wenden Sie sich an den Systembetreuer.'; +$lang['authpwdexpire'] = 'Ihr Passwort läuft in %d Tag(en) ab. Sie sollten es ändern.'; $lang['i_chooselang'] = 'Wählen Sie Ihre Sprache'; $lang['i_installer'] = 'DokuWiki Installation'; $lang['i_wikiname'] = 'Wiki-Name'; diff --git a/inc/lang/en/lang.php b/inc/lang/en/lang.php index 89a7c4d40..9250d119a 100644 --- a/inc/lang/en/lang.php +++ b/inc/lang/en/lang.php @@ -275,6 +275,7 @@ $lang['subscr_style_list'] = 'list of changed pages since last email (e /* auth.class language support */ $lang['authmodfailed'] = 'Bad user authentication configuration. Please inform your Wiki Admin.'; $lang['authtempfail'] = 'User authentication is temporarily unavailable. If this situation persists, please inform your Wiki Admin.'; +$lang['authpwdexpire'] = 'Your password will expire in %d days. You should change it.'; /* installer strings */ $lang['i_chooselang'] = 'Choose your language'; -- cgit v1.2.3 From 95fbd79bc40a02aa5fdf80a55e8f2c77e5ae71f2 Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Mon, 7 Nov 2011 15:16:36 +0100 Subject: German translation for password reset --- inc/lang/de/resetpwd.txt | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 inc/lang/de/resetpwd.txt diff --git a/inc/lang/de/resetpwd.txt b/inc/lang/de/resetpwd.txt new file mode 100644 index 000000000..a0a55c67a --- /dev/null +++ b/inc/lang/de/resetpwd.txt @@ -0,0 +1,4 @@ +====== Neues Passwort setzen ====== + +Bitte geben Sie ein neues Passwort für Ihren Wiki-Zugang ein. + -- cgit v1.2.3 From c182a13644e70a6ef9f4288415c2cd74ab8b738b Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Sun, 13 Nov 2011 09:56:55 +0100 Subject: fixed HTML in Esperanto language file --- inc/lang/eo/lang.php | 45 ++++++++++++++++++++++----------------------- 1 file changed, 22 insertions(+), 23 deletions(-) diff --git a/inc/lang/eo/lang.php b/inc/lang/eo/lang.php index abb6bf7d7..c8f5694de 100644 --- a/inc/lang/eo/lang.php +++ b/inc/lang/eo/lang.php @@ -26,8 +26,8 @@ $lang['btn_search'] = 'Serĉi'; $lang['btn_save'] = 'Konservi'; $lang['btn_preview'] = 'Antaŭrigardi'; $lang['btn_top'] = 'Supren'; -$lang['btn_newer'] = '<< pli freŝe'; -$lang['btn_older'] = 'malpli freŝe >>'; +$lang['btn_newer'] = '<< pli freŝe'; +$lang['btn_older'] = 'malpli freŝe >>'; $lang['btn_revs'] = 'Malnovaj revizioj'; $lang['btn_recent'] = 'Freŝaj ŝanĝoj'; $lang['btn_upload'] = 'Alŝuti'; @@ -124,8 +124,7 @@ $lang['js']['medialeft'] = 'Meti la bildon maldekstren.'; $lang['js']['mediaright'] = 'Meti la bildon dekstren.'; $lang['js']['mediacenter'] = 'Meti la bildon mezen.'; $lang['js']['medianoalign'] = 'Ne uzi poziciigon.'; -$lang['js']['nosmblinks'] = 'Tio ĉi nur funkcias en la Vindozaĉa "Microsoft Internet Explorer". -Vi ankoraŭ povas kopii kaj almeti la ligilon.'; +$lang['js']['nosmblinks'] = 'Tio ĉi nur funkcias en la Vindozaĉa "Microsoft Internet Explorer".\nVi ankoraŭ povas kopii kaj almeti la ligilon.'; $lang['js']['linkwiz'] = 'Ligil-Asistanto'; $lang['js']['linkto'] = 'Ligilo al:'; $lang['js']['del_confirm'] = 'Ĉu vere forigi elektitajn ero(j)n?'; @@ -152,16 +151,16 @@ $lang['uploadbadcontent'] = 'La alŝutita enhavo ne kongruas al la sufikso $lang['uploadspam'] = 'La alŝutaĵo estis blokita de kontraŭspama vortlisto.'; $lang['uploadxss'] = 'La alŝutajo estis blokita pro ebla malica enhavo.'; $lang['uploadsize'] = 'La alŝutita dosiero estis tro granda. (maks. %s)'; -$lang['deletesucc'] = 'La dosiero "%s%quot; estas forigita.'; -$lang['deletefail'] = '"%s" ne povis esti forigita - kontrolu permes-atributojn.'; -$lang['mediainuse'] = 'La dosiero "%s" ne estis forigita - ĝi ankoraŭ estas uzata.'; +$lang['deletesucc'] = 'La dosiero "%s" estas forigita.'; +$lang['deletefail'] = '"%s" ne povis esti forigita - kontrolu permes-atributojn.'; +$lang['mediainuse'] = 'La dosiero "%s" ne estis forigita - ĝi ankoraŭ estas uzata.'; $lang['namespaces'] = 'Nomspacoj'; $lang['mediafiles'] = 'Disponeblaj dosieroj'; $lang['accessdenied'] = 'Vi ne rajtas vidi tiun paĝon.'; $lang['mediausage'] = 'Uzu la jenan sintakson por referenci tiun ĉi dosieron:'; $lang['mediaview'] = 'Rigardi originalan dosieron'; $lang['mediaroot'] = 'ĉefo (root)'; -$lang['mediaupload'] = 'Alŝutu dosieron al la kuranta nomspaco tien ĉi. Por krei subnomspacojn, antaŭmetu ilin al via "Alŝuti kiel" dosiernomo, apartigante per dupunktoj (:).'; +$lang['mediaupload'] = 'Alŝutu dosieron al la kuranta nomspaco tien ĉi. Por krei subnomspacojn, antaŭmetu ilin al via "Alŝuti kiel" dosiernomo, apartigante per dupunktoj (:).'; $lang['mediaextchange'] = 'La dosiersufikso ŝanĝis de .%s al .%s!'; $lang['reference'] = 'Referencoj por'; $lang['ref_inuse'] = 'La dosiero ne povas esti forigita, ĉar ĝi ankoraŭ estas uzata de la jenaj paĝoj:'; @@ -187,7 +186,7 @@ $lang['created'] = 'kreita'; $lang['restored'] = 'malnova revizio restarigita'; $lang['external_edit'] = 'ekstera redakto'; $lang['summary'] = 'Bulteno de ŝanĝoj'; -$lang['noflash'] = 'La <a href="http://www.adobe.com/products/flashplayer/">Adobe Flash Plugin</a> estas bezonata por montrigi tiun ĉi enhavon.'; +$lang['noflash'] = 'La Adobe Flash Plugin estas bezonata por montrigi tiun ĉi enhavon.'; $lang['download'] = 'Elŝuti eltiraĵon'; $lang['mail_newpage'] = 'paĝo aldonita:'; $lang['mail_changed'] = 'paĝo modifita:'; @@ -262,20 +261,20 @@ $lang['authtempfail'] = 'La identigo de via uzantonomo estas intertempe $lang['i_chooselang'] = 'Elektu vian lingvon'; $lang['i_installer'] = 'Instalilo de DokuWiki'; $lang['i_wikiname'] = 'Nomo de la vikio'; -$lang['i_enableacl'] = 'Ebligi "ACL" (alirkontrolo, rekomendinde)'; +$lang['i_enableacl'] = 'Ebligi "ACL" (alirkontrolo, rekomendinde)'; $lang['i_superuser'] = 'Superuzanto'; $lang['i_problems'] = 'La instalilo trovis kelkajn problemojn, indikitaj sube. Vi ne povas pluiri ĝis ili estos iel korektitaj.'; $lang['i_modified'] = 'Pro sekureco tiu ĉi instalilo nur funkcias por nova kaj nemodifita DokuWiki-pakaĵo. Vi devas aŭ redemeti la dosierojn el la elŝutita pakaĵo aŭ plibone informiĝi pri la instalada procezo.'; -$lang['i_funcna'] = 'La PHP-a funkcio <code>%s</code> ne estas uzebla. Eble via retprovizanto ial malpermesis tion?'; -$lang['i_phpver'] = 'La versio de la PHP <code>%s</code> estas pli malnova ol la bezonata <code>%s</code>. Vi bezonas ĝisdatigi la PHP-an instalon.'; -$lang['i_permfail'] = '<code>%s</code> ne estas skribebla por DokuWiki. Vi devas redifini la permes-atributojn de tiu ĉi dosierujo!'; -$lang['i_confexists'] = '<code>%s</code> jam ekzistas'; -$lang['i_writeerr'] = 'Ne eblas krei "<code>%s</code>". Vi bezonas kontroli la permesojn de la dosier(uj)oj kaj mem krej la dosieron.'; -$lang['i_badhash'] = 'dokuwiki.php ne estas rekonebla aŭ ĝi estas modifita (hash=<code>%s</code>)'; -$lang['i_badval'] = '<code>%s</code> - malvalida aŭ malplena valoro'; -$lang['i_success'] = 'La agordado estas sukcese kompletita. Vi povas forigi la dosieron nun. Pluiru al <a href="doku.php">via nova DokuWiki</a>.'; -$lang['i_failure'] = 'Kelkaj eraroj okazis dum la konservo de la agordaj dosieroj. Vi devas senpere korekti ilin antaŭ ol vi povos uzi <a href="doku.php">vian novan DokuWiki-on</a>. '; +$lang['i_funcna'] = 'La PHP-a funkcio %s ne estas uzebla. Eble via retprovizanto ial malpermesis tion?'; +$lang['i_phpver'] = 'La versio de la PHP %s estas pli malnova ol la bezonata %s. Vi bezonas ĝisdatigi la PHP-an instalon.'; +$lang['i_permfail'] = '%s ne estas skribebla por DokuWiki. Vi devas redifini la permes-atributojn de tiu ĉi dosierujo!'; +$lang['i_confexists'] = '%s jam ekzistas'; +$lang['i_writeerr'] = 'Ne eblas krei "%s". Vi bezonas kontroli la permesojn de la dosier(uj)oj kaj mem krej la dosieron.'; +$lang['i_badhash'] = 'dokuwiki.php ne estas rekonebla aŭ ĝi estas modifita (hash=%s)'; +$lang['i_badval'] = '%s - malvalida aŭ malplena valoro'; +$lang['i_success'] = 'La agordado estas sukcese kompletita. Vi povas forigi la dosieron nun. Pluiru al via nova DokuWiki.'; +$lang['i_failure'] = 'Kelkaj eraroj okazis dum la konservo de la agordaj dosieroj. Vi devas senpere korekti ilin antaŭ ol vi povos uzi vian novan DokuWiki-on. '; $lang['i_policy'] = 'Komenca ACL-a agordo'; $lang['i_pol0'] = 'Malferma Vikio (legi, skribi, alŝuti povas ĉiuj)'; $lang['i_pol1'] = 'Publika Vikio (legi povas ĉiuj, skribi kaj alŝuti povas registritaj uzantoj)'; @@ -293,11 +292,11 @@ $lang['mu_ready'] = 'preta por alŝuti'; $lang['mu_done'] = 'plenumite'; $lang['mu_fail'] = 'malsukcesinte'; $lang['mu_authfail'] = 'sekcio tro longdaŭris'; -$lang['mu_progress'] = '@PCT@% alŝutite'; +$lang['mu_progress'] = '@PCT@% alŝutite'; $lang['mu_filetypes'] = 'Permesitaj dosiertipoj'; $lang['mu_info'] = 'alŝutitaj dosieroj.'; $lang['mu_lasterr'] = 'Lasta eraro:'; -$lang['recent_global'] = 'Vi nun rigardas la ŝanĝojn ene de la nomspaco <b>%s</b>. Vi povas ankaŭ <a href="%s">vidi la freŝajn ŝanĝojn de la tuta vikio</a>.'; +$lang['recent_global'] = 'Vi nun rigardas la ŝanĝojn ene de la nomspaco %s. Vi povas ankaŭ vidi la freŝajn ŝanĝojn de la tuta vikio.'; $lang['years'] = 'antaŭ %d jaroj'; $lang['months'] = 'antaŭ %d monatoj'; $lang['weeks'] = 'antaŭ %d semajnoj'; @@ -318,8 +317,8 @@ $lang['media_sort_name'] = 'per nomo'; $lang['media_sort_date'] = 'per dato'; $lang['media_namespaces'] = 'Elektu nomspacon'; $lang['media_files'] = 'Dosieroj en %s'; -$lang['media_upload'] = 'Alŝuti al la nomspaco <strong>%s</strong>.'; -$lang['media_search'] = 'Serĉi en la nomspaco <strong>%s</strong>.'; +$lang['media_upload'] = 'Alŝuti al la nomspaco %s.'; +$lang['media_search'] = 'Serĉi en la nomspaco %s.'; $lang['media_view'] = '%s'; $lang['media_viewold'] = '%s ĉe %s'; $lang['media_edit'] = 'Modifi'; -- cgit v1.2.3 From ce7a6b36ab2da1d9134e92a8ccf420c698d54cb5 Mon Sep 17 00:00:00 2001 From: Otto Vainio Date: Sun, 13 Nov 2011 10:00:16 +0100 Subject: Finnish language fixes --- inc/lang/fi/lang.php | 22 +++++++++++++--------- lib/plugins/plugin/lang/fi/lang.php | 2 +- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/inc/lang/fi/lang.php b/inc/lang/fi/lang.php index 8d671a4cb..3477f15a3 100644 --- a/inc/lang/fi/lang.php +++ b/inc/lang/fi/lang.php @@ -242,7 +242,7 @@ $lang['img_manager'] = 'Näytä mediamanagerissa'; $lang['subscr_subscribe_success'] = '%s lisätty %s tilauslistalle'; $lang['subscr_subscribe_error'] = 'Virhe lisättäessä %s tilauslistalle %s'; $lang['subscr_subscribe_noaddress'] = 'Login tiedoissasi ei ole sähköpostiosoitetta. Sinua ei voi lisätä tilaukseen'; -$lang['subscr_unsubscribe_success'] = '% poistettu tilauslistalta %s'; +$lang['subscr_unsubscribe_success'] = '%s poistettu tilauslistalta %s'; $lang['subscr_unsubscribe_error'] = 'Virhe tapahtui poistaessa %s tilauslistalta %s'; $lang['subscr_already_subscribed'] = '%s on jo tilannut %s'; $lang['subscr_not_subscribed'] = '%s ei ole tilannut %s'; @@ -253,8 +253,8 @@ $lang['subscr_m_unsubscribe'] = 'Poista tilaus'; $lang['subscr_m_subscribe'] = 'Tilaa'; $lang['subscr_m_receive'] = 'Vastaanota'; $lang['subscr_style_every'] = 'Sähköposti joka muutoksesta'; -$lang['subscr_style_digest'] = 'yhteenveto sähköposti joka sivusta'; -$lang['subscr_style_list'] = 'lista muuttuneista sivuista edellisen sähköpostin jälkeen'; +$lang['subscr_style_digest'] = 'yhteenveto-sähköposti joka sivusta (joka %.2f. päivä)'; +$lang['subscr_style_list'] = 'lista muuttuneista sivuista edellisen sähköpostin jälkeen (joka %.2f. päivä)'; $lang['authmodfailed'] = 'Käyttäjien autentikoinnin asetukset ovat virheelliset. Ilmoita asiasta wikin ylläpitäjälle.'; $lang['authtempfail'] = 'Käyttäjien autentikointi ei tällä hetkellä onnistu. Jos ongelma jatkuu, ota yhteyttä wikin ylläpitäjään.'; $lang['i_chooselang'] = 'Valitse kieli'; @@ -301,22 +301,26 @@ $lang['weeks'] = '%d viikkoa sitten'; $lang['days'] = '%d päivää sitten'; $lang['hours'] = '%d tuntia sitten'; $lang['minutes'] = '%d minuuttia sitten'; -$lang['seconds'] = '% sekuntia sitten'; +$lang['seconds'] = '%d sekuntia sitten'; $lang['wordblock'] = 'Muutostasi ei talletettu, koska se sisältää estettyä tekstiä (spam).'; $lang['media_uploadtab'] = 'Lähetä'; $lang['media_searchtab'] = 'Etsi'; +$lang['media_file'] = 'Tiedosto'; $lang['media_viewtab'] = 'Näytä'; $lang['media_edittab'] = 'Muokkaa'; $lang['media_historytab'] = 'Historia'; -$lang['media_thumbsview'] = 'Pikkukuvat'; -$lang['media_listview'] = 'Lista'; -$lang['media_sort'] = 'Järjestä'; +$lang['media_list_thumbs'] = 'Thumbnails'; +$lang['media_list_rows'] = 'Rivit'; $lang['media_sort_name'] = 'nimen mukaan'; $lang['media_sort_date'] = 'päivämäärän mukaan'; +$lang['media_namespaces'] = 'Valitse nimiavaruus'; +$lang['media_files'] = 'Tiedostoja %s'; $lang['media_upload'] = 'Lähetä %s nimiavaruuteen'; $lang['media_search'] = 'Etsi %s nimiavaruudesta'; -$lang['media_edit'] = 'Muokkaa'; -$lang['media_history'] = 'Nämä ovat vanhat versiot tiedostosta.'; +$lang['media_view'] = '%s'; +$lang['media_viewold'] = '%s at %s'; +$lang['media_edit'] = 'Muokkaa %s'; +$lang['media_history'] = 'Nämä ovat vanhat versiot tiedostosta %s'; $lang['media_meta_edited'] = 'Metadataa muokattu'; $lang['media_perm_read'] = 'Anteeksi. Sinulla ei ole riittävästi oikeuksia lukeaksesi tiedostoja.'; $lang['media_perm_upload'] = 'Anteeksi. Sinulla ei ole riittävästi oikeuksia lähettääksesi tiedostoja.'; diff --git a/lib/plugins/plugin/lang/fi/lang.php b/lib/plugins/plugin/lang/fi/lang.php index c348a2331..923029a6f 100644 --- a/lib/plugins/plugin/lang/fi/lang.php +++ b/lib/plugins/plugin/lang/fi/lang.php @@ -51,4 +51,4 @@ $lang['enabled'] = 'Liitännäinen %s käytössä'; $lang['notenabled'] = 'Liitännäistä %s ei voitu ottaa käyttöön. Tarkista tiedostojen oikeudet.'; $lang['disabled'] = 'Liitännäinen %s pois käytössä'; $lang['notdisabled'] = 'Liitännäistä %s ei voitu ottaa pois käytöstä. Tarkista tiedostojen oikeudet.'; -$lang['packageinstalled'] = 'Pluginpaketti (%d plugin%s: %s:) asennettu onnistuneesti.'; +$lang['packageinstalled'] = 'Pluginpaketti (%d plugin: %s:) asennettu onnistuneesti.'; -- cgit v1.2.3 From 1420e73d5e21de82e3e1a7a88bdaac5cd6827c92 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbyn=C4=9Bk=20K=C5=99ivka?= Date: Sun, 13 Nov 2011 10:02:35 +0100 Subject: Czech language update --- inc/lang/cs/lang.php | 69 ++++++++++++++++++++++++++------ lib/plugins/acl/lang/cs/lang.php | 1 + lib/plugins/config/lang/cs/lang.php | 9 +++-- lib/plugins/plugin/lang/cs/lang.php | 3 +- lib/plugins/popularity/lang/cs/lang.php | 1 + lib/plugins/revert/lang/cs/lang.php | 3 +- lib/plugins/usermanager/lang/cs/lang.php | 1 + 7 files changed, 70 insertions(+), 17 deletions(-) diff --git a/inc/lang/cs/lang.php b/inc/lang/cs/lang.php index 292c2c42e..c6eb7be49 100644 --- a/inc/lang/cs/lang.php +++ b/inc/lang/cs/lang.php @@ -10,6 +10,7 @@ * @author Marek Sacha * @author Lefty * @author Vojta Beran + * @author zbynek.krivka@seznam.cz */ $lang['encoding'] = 'utf-8'; $lang['direction'] = 'ltr'; @@ -51,6 +52,8 @@ $lang['btn_recover'] = 'Obnovit koncept'; $lang['btn_draftdel'] = 'Vymazat koncept'; $lang['btn_revert'] = 'Vrátit zpět'; $lang['btn_register'] = 'Registrovat'; +$lang['btn_apply'] = 'Použít'; +$lang['btn_media'] = 'Správa médií'; $lang['loggedinas'] = 'Přihlášen(a) jako'; $lang['user'] = 'Uživatelské jméno'; $lang['pass'] = 'Heslo'; @@ -95,7 +98,7 @@ $lang['txt_filename'] = 'Wiki jméno (volitelné)'; $lang['txt_overwrt'] = 'Přepsat existující soubor'; $lang['lockedby'] = 'Právě zamknuto:'; $lang['lockexpire'] = 'Zámek vyprší:'; -$lang['js']['willexpire'] = 'Váš zámek pro editaci za chvíli vyprší.\nAbyste předešli konfliktům, stiskněte tlačítko Náhled a zámek se prodlouží.'; +$lang['js']['willexpire'] = 'Váš zámek pro editaci za chvíli vyprší.\nAbyste předešli konfliktům, stiskněte tlačítko Náhled a zámek se prodlouží.'; $lang['js']['notsavedyet'] = 'Jsou tu neuložené změny, které budou ztraceny. Chcete opravdu pokračovat?'; $lang['js']['searchmedia'] = 'Hledat soubory'; @@ -127,6 +130,17 @@ Přesto tento odkaz můžete zkopírovat a vložit jinde.'; $lang['js']['linkwiz'] = 'Průvodce odkazy'; $lang['js']['linkto'] = 'Odkaz na:'; $lang['js']['del_confirm'] = 'Vymazat tuto položku?'; +$lang['js']['restore_confirm'] = 'Opravdu obnovit tuto verzi?'; +$lang['js']['media_diff'] = 'Prohlédnout rozdíly:'; +$lang['js']['media_diff_both'] = 'Vedle sebe'; +$lang['js']['media_diff_opacity'] = 'Zvýraznění'; +$lang['js']['media_diff_portions'] = 'Osvědčit'; +$lang['js']['media_select'] = 'Vybrat soubory...'; +$lang['js']['media_upload_btn'] = 'Nahrát'; +$lang['js']['media_done_btn'] = 'Hotovo'; +$lang['js']['media_drop'] = 'Sem přetáhněte soubory pro nahrátí'; +$lang['js']['media_cancel'] = 'odstranit'; +$lang['js']['media_overwrt'] = 'Přepsat existující soubory'; $lang['rssfailed'] = 'Nastala chyba při vytváření tohoto RSS: '; $lang['nothingfound'] = 'Nic nenalezeno.'; $lang['mediaselect'] = 'Výběr dokumentu'; @@ -161,7 +175,7 @@ $lang['yours'] = 'Vaše verze'; $lang['diff'] = 'Zobrazit rozdíly vůči aktuální verzi'; $lang['diff2'] = 'Zobrazit rozdíly mezi vybranými verzemi'; $lang['difflink'] = 'Odkaz na výstup diff'; -$lang['diff_type'] = 'Prohlédnout rozdíly:'; +$lang['diff_type'] = 'Zobrazit rozdíly:'; $lang['diff_inline'] = 'Vložené'; $lang['diff_side'] = 'Přidané'; $lang['line'] = 'Řádek'; @@ -181,6 +195,10 @@ $lang['mail_changed'] = 'změna stránky:'; $lang['mail_subscribe_list'] = 'stránky změněné ve jmenném prostoru:'; $lang['mail_new_user'] = 'nový uživatel:'; $lang['mail_upload'] = 'načtený dokument:'; +$lang['changes_type'] = 'Prohlednou změny '; +$lang['pages_changes'] = 'stránek'; +$lang['media_changes'] = 'souborů médií'; +$lang['both_changes'] = 'stránek i médií'; $lang['qb_bold'] = 'Tučně'; $lang['qb_italic'] = 'Kurzíva'; $lang['qb_underl'] = 'Podtržení'; @@ -221,6 +239,9 @@ $lang['img_copyr'] = 'Copyright'; $lang['img_format'] = 'Formát'; $lang['img_camera'] = 'Typ fotoaparátu'; $lang['img_keywords'] = 'Klíčová slova'; +$lang['img_width'] = 'Šířka'; +$lang['img_height'] = 'Výška'; +$lang['img_manager'] = 'Zobrazit ve správě médií'; $lang['subscr_subscribe_success'] = '%s byl přihlášen do seznamu odběratelů %s'; $lang['subscr_subscribe_error'] = 'Došlo k chybě při přihlašování %s do seznamu odběratelů %s'; $lang['subscr_subscribe_noaddress'] = 'K Vašemu loginu neexistuje žádná adresa, nemohl jste být přihlášen do seznamu odběratelů.'; @@ -235,8 +256,8 @@ $lang['subscr_m_unsubscribe'] = 'Odhlásit z odběru změn emailem'; $lang['subscr_m_subscribe'] = 'Přihlásit se k odběru změn emailem'; $lang['subscr_m_receive'] = 'Přejete si dostávat'; $lang['subscr_style_every'] = 'email pro každou změnu'; -$lang['subscr_style_digest'] = 'souhrnný email změn pro každou stránku'; -$lang['subscr_style_list'] = 'seznam změněných stránek od posledního emailu'; +$lang['subscr_style_digest'] = 'souhrnný email změn pro každou stránku (každé %.2f dny/dní)'; +$lang['subscr_style_list'] = 'seznam změněných stránek od posledního emailu (každé %.2f dny/dní)'; $lang['authmodfailed'] = 'Autentizace uživatelů je špatně nastavena. Informujte prosím správce této wiki.'; $lang['authtempfail'] = 'Autentizace uživatelů je dočasně nedostupná. Pokud tento problém přetrvává, informujte prosím správce této wiki.'; $lang['i_chooselang'] = 'Vyberte si jazyk'; @@ -245,7 +266,7 @@ $lang['i_wikiname'] = 'Název wiki'; $lang['i_enableacl'] = 'Zapnout ACL (doporučeno)'; $lang['i_superuser'] = 'Správce'; $lang['i_problems'] = 'Instalátor narazil na níže popsané problémy. Nelze pokračovat v instalaci, dokud je neopravíte.'; -$lang['i_modified'] = 'Instalátor bude z bezpečnostních důvodů pracovat pouze s čistou a ještě neupravenou instalací DokuWiki. Buď znovu rozbalte souboru z instalačního balíčku nebo se zkuste poradit s instrukcemi pro instalaci DokuWiki.'; +$lang['i_modified'] = 'Instalátor bude z bezpečnostních důvodů pracovat pouze s čistou a ještě neupravenou instalací DokuWiki. Buď znovu rozbalte soubory z instalačního balíčku, nebo zkuste prostudovat instrukce pro instalaci DokuWiki.'; $lang['i_funcna'] = 'PHP funkce %s není dostupná. Váš webhosting ji možná z nějakého důvodu vypnul.'; $lang['i_phpver'] = 'Verze vaší instalace PHP %s je nižší než požadovaná %s. Budete muset aktualizovat svou instalaci PHP.'; $lang['i_permfail'] = 'DokuWiki nemůže zapisovat do %s. Budete muset opravit práva k tomuto adresáři.'; @@ -277,11 +298,35 @@ $lang['mu_filetypes'] = 'Povolené typy souborů'; $lang['mu_info'] = 'soubory načteny.'; $lang['mu_lasterr'] = 'Poslední chyba:'; $lang['recent_global'] = 'Právě si prohlížíte změny ve jmenném prostoru %s. Také si můžete zobrazit změny v celé wiki.'; -$lang['years'] = 'před % roky'; -$lang['months'] = 'před % měsíci'; -$lang['weeks'] = 'před % týdny'; -$lang['days'] = 'před % dny'; -$lang['hours'] = 'před % hodinami'; -$lang['minutes'] = 'před % minutami'; -$lang['seconds'] = 'před % sekundami'; +$lang['years'] = 'před %d roky'; +$lang['months'] = 'před %d měsíci'; +$lang['weeks'] = 'před %d týdny'; +$lang['days'] = 'před %d dny'; +$lang['hours'] = 'před %d hodinami'; +$lang['minutes'] = 'před %d minutami'; +$lang['seconds'] = 'před %d sekundami'; $lang['wordblock'] = 'Vaše změny nebyly uloženy, protože obsahují blokovaný text(spam).'; +$lang['media_uploadtab'] = 'Nahrát'; +$lang['media_searchtab'] = 'Hledat'; +$lang['media_file'] = 'Soubor'; +$lang['media_viewtab'] = 'Zobrazit'; +$lang['media_edittab'] = 'Upravit'; +$lang['media_historytab'] = 'Historie'; +$lang['media_list_thumbs'] = 'Zmenšeniny'; +$lang['media_list_rows'] = 'Řádky'; +$lang['media_sort_name'] = 'Jméno'; +$lang['media_sort_date'] = 'Datum'; +$lang['media_namespaces'] = 'Vyber jmenný prostor'; +$lang['media_files'] = 'Soubory v %s'; +$lang['media_upload'] = 'Upload do %s'; +$lang['media_search'] = 'Hledat v %s'; +$lang['media_view'] = '%s'; +$lang['media_viewold'] = '%s na %s'; +$lang['media_edit'] = 'Upravit %s'; +$lang['media_history'] = 'Historie %s'; +$lang['media_meta_edited'] = 'metadata upravena'; +$lang['media_perm_read'] = 'Bohužel, nemáte práva číst soubory.'; +$lang['media_perm_upload'] = 'Bohužel, nemáte práva nahrávat soubory.'; +$lang['media_update'] = 'Nahrát novou verzi'; +$lang['media_restore'] = 'Obnovit tuto verzi'; +$lang['plugin_install_err'] = 'Plugin je špatně nainstalován. Přejmenujte adresář pluginu \'%s\' na \'%s\'.'; diff --git a/lib/plugins/acl/lang/cs/lang.php b/lib/plugins/acl/lang/cs/lang.php index 7c1efbd4c..cc1d97023 100644 --- a/lib/plugins/acl/lang/cs/lang.php +++ b/lib/plugins/acl/lang/cs/lang.php @@ -9,6 +9,7 @@ * @author Marek Sacha * @author Lefty * @author Vojta Beran + * @author zbynek.krivka@seznam.cz */ $lang['admin_acl'] = 'Správa přístupových práv'; $lang['acl_group'] = 'Skupina'; diff --git a/lib/plugins/config/lang/cs/lang.php b/lib/plugins/config/lang/cs/lang.php index 9126a041a..bf87e99d5 100644 --- a/lib/plugins/config/lang/cs/lang.php +++ b/lib/plugins/config/lang/cs/lang.php @@ -9,6 +9,7 @@ * @author Marek Sacha * @author Lefty * @author Vojta Beran + * @author zbynek.krivka@seznam.cz */ $lang['menu'] = 'Správa nastavení'; $lang['error'] = 'Nastavení nebyla změněna kvůli alespoň jedné neplatné položce, @@ -44,10 +45,11 @@ $lang['_msg_setting_no_default'] = 'Chybí výchozí hodnota položky.'; $lang['fmode'] = 'Přístupová práva pro vytváření souborů'; $lang['dmode'] = 'Přístupová práva pro vytváření adresářů'; $lang['lang'] = 'Jazyk'; -$lang['basedir'] = 'Kořenový adresář'; -$lang['baseurl'] = 'Kořenové URL'; +$lang['basedir'] = 'Kořenový adresář (např. /dokuwiki/). Pro autodetekci nechte prázdné.'; +$lang['baseurl'] = 'Kořenové URL (např. http://www.yourserver.com). Pro autodetekci nechte prázdné.'; $lang['savedir'] = 'Adresář pro ukládání dat'; -$lang['start'] = 'Název úvodních stránek'; +$lang['cookiedir'] = 'Cesta pro cookie. Není-li vyplněno, použije se kořenové URL.'; +$lang['start'] = 'Název úvodní stránky'; $lang['title'] = 'Název celé wiki'; $lang['template'] = 'Šablona'; $lang['license'] = 'Pod jakou licencí má být tento obsah publikován?'; @@ -122,6 +124,7 @@ $lang['jpg_quality'] = 'Kvalita komprese JPEG (0-100)'; $lang['subscribers'] = 'Možnost přihlásit se k odběru novinek stránky'; $lang['subscribe_time'] = 'Časový interval v sekundách, ve kterém jsou posílány změny a souhrny změn. Interval by neměl být kratší než čas uvedený v recent_days.'; $lang['compress'] = 'Zahustit CSS a JavaScript výstup'; +$lang['cssdatauri'] = 'Velikost [v bajtech] obrázků odkazovaných v CSS souborech, které budou pro ušetření HTTP požadavku vestavěny do stylu. Tato technika nefunguje v IE 7 a starším. Doporučená hodnota je mezi 400 a 600 bajty. Pro vypnutí nastavte na 0.'; $lang['hidepages'] = 'Skrýt stránky odpovídající vzoru (regulární výrazy)'; $lang['send404'] = 'Posílat "HTTP 404/Page Not Found" pro neexistují stránky'; $lang['sitemap'] = 'Generovat Google sitemap (interval ve dnech)'; diff --git a/lib/plugins/plugin/lang/cs/lang.php b/lib/plugins/plugin/lang/cs/lang.php index 7c0fb3468..0ccabf344 100644 --- a/lib/plugins/plugin/lang/cs/lang.php +++ b/lib/plugins/plugin/lang/cs/lang.php @@ -10,6 +10,7 @@ * @author Marek Sacha * @author Lefty * @author Vojta Beran + * @author zbynek.krivka@seznam.cz */ $lang['menu'] = 'Správa pluginů'; $lang['download'] = 'Stáhnout a instalovat plugin'; @@ -56,4 +57,4 @@ $lang['enabled'] = 'Plugin %s aktivován.'; $lang['notenabled'] = 'Plugin %s nelze aktivovat, zkontrolujte práva k souborům.'; $lang['disabled'] = 'Plugin %s deaktivován.'; $lang['notdisabled'] = 'Plugin %s nelze deaktivovat, zkontrolujte práva k souborům.'; -$lang['packageinstalled'] = 'Plugin package (%d plugin%s: %s) úspěšně nainstalován.'; +$lang['packageinstalled'] = 'Balíček pluginů (%d plugin(ů): %s) úspěšně nainstalován.'; diff --git a/lib/plugins/popularity/lang/cs/lang.php b/lib/plugins/popularity/lang/cs/lang.php index b0dc4d1a8..287bcf3b0 100644 --- a/lib/plugins/popularity/lang/cs/lang.php +++ b/lib/plugins/popularity/lang/cs/lang.php @@ -7,6 +7,7 @@ * @author Marek Sacha * @author Lefty * @author Vojta Beran + * @author zbynek.krivka@seznam.cz */ $lang['name'] = 'Průzkum používání (může chviličku trvat, než se natáhne)'; $lang['submit'] = 'Odeslat data'; diff --git a/lib/plugins/revert/lang/cs/lang.php b/lib/plugins/revert/lang/cs/lang.php index 5c8899200..cf19381c8 100644 --- a/lib/plugins/revert/lang/cs/lang.php +++ b/lib/plugins/revert/lang/cs/lang.php @@ -10,6 +10,7 @@ * @author Marek Sacha * @author Lefty * @author Vojta Beran + * @author zbynek.krivka@seznam.cz */ $lang['menu'] = 'Obnova zaspamovaných stránek'; $lang['filter'] = 'Hledat zaspamované stránky'; @@ -21,5 +22,5 @@ skriptu vyprší čas, budete muset obnovovat po menších blocích stránek.'; $lang['revstop'] = 'Proces obnovy stránek byl úspěšně dokončen.'; $lang['note1'] = 'Poznámka: toto vyhledávání je citlivé na velikost písmen'; -$lang['note2'] = 'Poznámka: tato stránka bude obnovena na poslední verze, která +$lang['note2'] = 'Poznámka: tato stránka bude obnovena na poslední verzi, která neobsahovala dané spamové slovo %s.'; diff --git a/lib/plugins/usermanager/lang/cs/lang.php b/lib/plugins/usermanager/lang/cs/lang.php index c805011d7..fe54d4cce 100644 --- a/lib/plugins/usermanager/lang/cs/lang.php +++ b/lib/plugins/usermanager/lang/cs/lang.php @@ -9,6 +9,7 @@ * @author Marek Sacha * @author Lefty * @author Vojta Beran + * @author zbynek.krivka@seznam.cz */ $lang['menu'] = 'Správa uživatelů'; $lang['noauth'] = '(autentizace uživatelů není k dispozici)'; -- cgit v1.2.3 From d5cd65e49c16c2101422c28fee7714283d498ed2 Mon Sep 17 00:00:00 2001 From: Kiril Velikov Date: Sun, 13 Nov 2011 10:04:12 +0100 Subject: Bulgarian language update --- inc/lang/bg/lang.php | 2 +- lib/plugins/plugin/lang/bg/lang.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/inc/lang/bg/lang.php b/inc/lang/bg/lang.php index 8985e20e5..1c6c90703 100644 --- a/inc/lang/bg/lang.php +++ b/inc/lang/bg/lang.php @@ -311,7 +311,7 @@ $lang['media_list_thumbs'] = 'Миниатюри'; $lang['media_list_rows'] = 'Редове'; $lang['media_sort_name'] = 'Име'; $lang['media_sort_date'] = 'Дата'; -$lang['media_namespaces'] = 'Изберете именно пространство'; +$lang['media_namespaces'] = 'Изберете:'; $lang['media_files'] = 'Файлове в %s'; $lang['media_upload'] = 'Качване в %s'; $lang['media_search'] = 'Търсене в %s'; diff --git a/lib/plugins/plugin/lang/bg/lang.php b/lib/plugins/plugin/lang/bg/lang.php index 79f6e081f..09ac35229 100644 --- a/lib/plugins/plugin/lang/bg/lang.php +++ b/lib/plugins/plugin/lang/bg/lang.php @@ -51,4 +51,4 @@ $lang['enabled'] = 'Приставката %s е включена. $lang['notenabled'] = 'Приставката %s не може да бъде включена, моля проверете правата за файловете.'; $lang['disabled'] = 'Приставката %s е изключена.'; $lang['notdisabled'] = 'Приставката %s не е изключена, моля проверете правата за файловете.'; -$lang['packageinstalled'] = 'Пакетът е инсталиран успешно (%d приставка%s: %s).'; +$lang['packageinstalled'] = 'Пакетът е инсталиран успешно (%d приставка: %s).'; -- cgit v1.2.3 From 54db0171afdbc0c3204e9c016f3c7a37421e62aa Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Sun, 13 Nov 2011 10:38:03 +0100 Subject: fixed various errors in language files --- inc/lang/it/lang.php | 6 +++--- inc/lang/kk/lang.php | 2 +- inc/lang/la/lang.php | 2 +- inc/lang/lb/lang.php | 2 +- inc/lang/lv/lang.php | 18 +++++++++--------- inc/lang/pt-br/lang.php | 4 ++-- inc/lang/pt/lang.php | 2 +- lib/plugins/config/lang/ca/lang.php | 4 ++-- lib/plugins/plugin/lang/es/lang.php | 2 +- lib/plugins/plugin/lang/eu/lang.php | 2 +- lib/plugins/plugin/lang/fa/lang.php | 2 +- lib/plugins/plugin/lang/hu/lang.php | 2 +- lib/plugins/plugin/lang/ja/lang.php | 2 +- lib/plugins/plugin/lang/ko/lang.php | 2 +- lib/plugins/plugin/lang/mk/lang.php | 4 ++-- lib/plugins/plugin/lang/nl/lang.php | 2 +- lib/plugins/plugin/lang/pl/lang.php | 2 +- lib/plugins/plugin/lang/pt-br/lang.php | 2 +- lib/plugins/plugin/lang/pt/lang.php | 2 +- lib/plugins/plugin/lang/sk/lang.php | 2 +- lib/plugins/plugin/lang/uk/lang.php | 2 +- lib/plugins/plugin/lang/zh-tw/lang.php | 2 +- lib/plugins/plugin/lang/zh/lang.php | 2 +- lib/plugins/revert/lang/lv/lang.php | 2 +- lib/plugins/revert/lang/pt-br/lang.php | 2 +- lib/plugins/usermanager/lang/es/lang.php | 2 +- 26 files changed, 39 insertions(+), 39 deletions(-) diff --git a/inc/lang/it/lang.php b/inc/lang/it/lang.php index 9f4d42004..ebbe983de 100644 --- a/inc/lang/it/lang.php +++ b/inc/lang/it/lang.php @@ -92,7 +92,7 @@ $lang['resendpwdsuccess'] = 'La nuova password è stata spedita via email.' $lang['license'] = 'Ad eccezione da dove è diversamente indicato, il contenuto di questo wiki è soggetto alla seguente licenza:'; $lang['licenseok'] = 'Nota: modificando questa pagina accetti di rilasciare il contenuto sotto la seguente licenza:'; $lang['searchmedia'] = 'Cerca file di nome:'; -$lang['searchmedia_in'] = 'Cerca in &s'; +$lang['searchmedia_in'] = 'Cerca in %s'; $lang['txt_upload'] = 'Seleziona un file da caricare'; $lang['txt_filename'] = 'Carica come (opzionale)'; $lang['txt_overwrt'] = 'Sovrascrivi file esistente'; @@ -225,8 +225,8 @@ $lang['subscr_subscribe_error'] = 'Impossibile aggiungere %s alla lista di sotto $lang['subscr_subscribe_noaddress'] = 'Non esiste alcun indirizzo associato al tuo account, non puoi essere aggiunto alla lista di sottoscrizioni'; $lang['subscr_unsubscribe_success'] = 'Rimosso %s dalla lista di sottoscrizioni %s'; $lang['subscr_unsubscribe_error'] = 'Impossibile rimuovere %s dalla lista di sottoscrizioni %s'; -$lang['subscr_already_subscribed'] = '% è già iscritto a %s'; -$lang['subscr_not_subscribed'] = '% non è iscritto a %s'; +$lang['subscr_already_subscribed'] = '%s è già iscritto a %s'; +$lang['subscr_not_subscribed'] = '%s non è iscritto a %s'; $lang['subscr_m_not_subscribed'] = 'Attualmente non sei iscritto alla pagina o categoria corrente'; $lang['subscr_m_new_header'] = 'Aggiungi sottoscrizione'; $lang['subscr_m_current_header'] = 'Sottoscrizioni attuali'; diff --git a/inc/lang/kk/lang.php b/inc/lang/kk/lang.php index f9ea0bced..9738ae51c 100644 --- a/inc/lang/kk/lang.php +++ b/inc/lang/kk/lang.php @@ -82,7 +82,7 @@ $lang['resendpwdsuccess'] = 'Сіздің жаңа құпиясөзіңіз $lang['license'] = 'Басқаша көрсетілген болмаса, бұл wiki-дің мазмұны келесі лицензия бойынша беріледі:'; $lang['licenseok'] = 'Ескерту: бұл бетті өңдеуіңізбен мазмұныңыз келесі лицензия бойынша беруге келесесіз:'; $lang['searchmedia'] = 'Іздеу файлдың атауы:'; -$lang['searchmedia_in'] = '%-мен іздеу:'; +$lang['searchmedia_in'] = '%s-мен іздеу:'; $lang['txt_upload'] = 'Еңгізетін файлды таңдау'; $lang['txt_filename'] = 'Келесідей еңгізу (қалауынша)'; $lang['txt_overwrt'] = 'Бар файлды қайта жазу'; diff --git a/inc/lang/la/lang.php b/inc/lang/la/lang.php index fd34a4ef8..e8d79a997 100644 --- a/inc/lang/la/lang.php +++ b/inc/lang/la/lang.php @@ -222,7 +222,7 @@ $lang['subscr_subscribe_noaddress'] = 'Cursus interretialis tuus deest, sic in i $lang['subscr_unsubscribe_success'] = 'A subscriptione %s deletur quod %s'; $lang['subscr_unsubscribe_error'] = 'Error delendi %s a subscriptione quod %s'; $lang['subscr_already_subscribed'] = '%s iam subscriptus\a est in %s'; -$lang['subscr_not_subscribed'] = '%s non subscriptus\a est in %n'; +$lang['subscr_not_subscribed'] = '%s non subscriptus\a est in %s'; $lang['subscr_m_not_subscribed'] = 'Non hanc paginam uel genus subscribere potes.'; $lang['subscr_m_new_header'] = 'Subscriptionem addere'; $lang['subscr_m_current_header'] = 'haec subscriptio:'; diff --git a/inc/lang/lb/lang.php b/inc/lang/lb/lang.php index 191a9bab5..00692f48e 100644 --- a/inc/lang/lb/lang.php +++ b/inc/lang/lb/lang.php @@ -206,7 +206,7 @@ $lang['mu_info'] = 'Dateien eropgelueden.'; $lang['mu_lasterr'] = 'Leschte Feeler:'; $lang['recent_global'] = 'Du kucks am Moment d\'Ännerungen innerhalb vum %s Namespace. Du kanns och d\'Kierzilech Ännerungen vum ganze Wiki kucken.'; $lang['years'] = 'virun %d Joer'; -$lang['months'] = 'virun % Méint'; +$lang['months'] = 'virun %d Méint'; $lang['weeks'] = 'virun %d Wochen'; $lang['days'] = 'virun %d Deeg'; $lang['hours'] = 'virun %d Stonnen'; diff --git a/inc/lang/lv/lang.php b/inc/lang/lv/lang.php index 205d2e56d..926341393 100644 --- a/inc/lang/lv/lang.php +++ b/inc/lang/lv/lang.php @@ -293,8 +293,8 @@ $lang['mu_lasterr'] = 'Pēdējā ķļūda.'; $lang['recent_global'] = 'Tu skati izmaiņas nodaļā %s. Ir iespējams skatīt jaunākos grozījums visā viki. '; $lang['years'] = 'pirms %d gadiem'; $lang['months'] = 'pirms %d mēnešiem'; -$lang['weeks'] = 'pirms % nedēļām'; -$lang['days'] = 'pirms %d dienām'; +$lang['weeks'] = 'pirms %d nedēļām'; +$lang['days'] = 'pirms %d dienām'; $lang['hours'] = 'pirms %d stundām'; $lang['minutes'] = 'pirms %d minūtēm'; $lang['seconds'] = 'pirms %d sekundēm'; @@ -310,16 +310,16 @@ $lang['media_list_rows'] = 'Rindas'; $lang['media_sort_name'] = 'Nosaukums'; $lang['media_sort_date'] = 'Datums'; $lang['media_namespaces'] = 'Norādīt nodaļu'; -$lang['media_files'] = 'Faili nodaļā s%'; -$lang['media_upload'] = 'Augšuplādēt nodaļā s%'; -$lang['media_search'] = 'Meklēt nodaļā s%'; -$lang['media_view'] = 's%'; -$lang['media_viewold'] = 's% nodaļā s%'; +$lang['media_files'] = 'Faili nodaļā %s'; +$lang['media_upload'] = 'Augšuplādēt nodaļā %s'; +$lang['media_search'] = 'Meklēt nodaļā %s'; +$lang['media_view'] = '%s'; +$lang['media_viewold'] = '%s nodaļā %s'; $lang['media_edit'] = 'Labot %s'; -$lang['media_history'] = 's% vēsture'; +$lang['media_history'] = '%s vēsture'; $lang['media_meta_edited'] = 'metadati laboti'; $lang['media_perm_read'] = 'Atvainojiet, jums nav tiesību skatīt failus. '; $lang['media_perm_upload'] = 'Atvainojiet, jums nav tiesību augšupielādēt. '; $lang['media_update'] = 'Augšupielādēt jaunu versiju'; $lang['media_restore'] = 'Atjaunot šo versiju'; -$lang['plugin_install_err'] = 'Modulis aplami instalēts. Pārdēvē moduļa direktoriju s% par s%.'; +$lang['plugin_install_err'] = 'Modulis aplami instalēts. Pārdēvē moduļa direktoriju %s par %s.'; diff --git a/inc/lang/pt-br/lang.php b/inc/lang/pt-br/lang.php index 066b3acaa..373590b76 100644 --- a/inc/lang/pt-br/lang.php +++ b/inc/lang/pt-br/lang.php @@ -235,8 +235,8 @@ $lang['subscr_subscribe_error'] = 'Ocorreu um erro na adição de %s à lista de $lang['subscr_subscribe_noaddress'] = 'Como não há nenhum endereço associado ao seu usuário, você não pode ser adicionado à lista de monitoramento'; $lang['subscr_unsubscribe_success'] = '%s foi removido da lista de monitoramento de %s'; $lang['subscr_unsubscribe_error'] = 'Ocorreu um erro na remoção de %s da lista de monitoramentos de %s'; -$lang['subscr_already_subscribed'] = '%s já está monitorando s%'; -$lang['subscr_not_subscribed'] = 's% não está monitorando s%'; +$lang['subscr_already_subscribed'] = '%s já está monitorando %s'; +$lang['subscr_not_subscribed'] = '%s não está monitorando %s'; $lang['subscr_m_not_subscribed'] = 'Você não está monitorando nem a página atual nem o espaço de nomes.'; $lang['subscr_m_new_header'] = 'Adicionar monitoramento'; $lang['subscr_m_current_header'] = 'Monitoramentos atuais'; diff --git a/inc/lang/pt/lang.php b/inc/lang/pt/lang.php index 3c3a8d9da..2fa8a1ab4 100644 --- a/inc/lang/pt/lang.php +++ b/inc/lang/pt/lang.php @@ -161,7 +161,7 @@ $lang['mediaroot'] = 'root'; $lang['mediaupload'] = 'Carregar ficheiros para o grupo actual aqui. Para criar sub-grupos: escrever o nome do sub-grupo seguido de : antes do nome do ficheiro no campo "Carregar como".'; $lang['mediaextchange'] = 'Extensão alterada de .%s para .%s!'; $lang['reference'] = 'Referências para'; -$lang['ref_inuse'] = 'O ficheiro "%s" não pode ser removido, porque está ainda a ser usado nestes documentos:'; +$lang['ref_inuse'] = 'O ficheiro não pode ser removido, porque está ainda a ser usado nestes documentos:'; $lang['ref_hidden'] = 'Algumas referências estão em documentos para os quais não tem permissão para ler'; $lang['hits'] = 'Resultados'; $lang['quickhits'] = 'Documentos encontrados'; diff --git a/lib/plugins/config/lang/ca/lang.php b/lib/plugins/config/lang/ca/lang.php index d53cf1031..1a2a22881 100644 --- a/lib/plugins/config/lang/ca/lang.php +++ b/lib/plugins/config/lang/ca/lang.php @@ -114,8 +114,8 @@ $lang['sitemap'] = 'Genera mapa del lloc en format Google (dies)'; $lang['broken_iua'] = 'No funciona en el vostre sistema la funció ignore_user_abort? Això podria malmetre l\'índex de cerques. Amb IIS+PHP/CGI se sap que no funciona. Vg. Bug 852 per a més informació.'; $lang['xsendfile'] = 'Utilitza la capçalera X-Sendfile perquè el servidor web distribueixi fitxers estàtics. No funciona amb tots els servidors web.'; $lang['renderer_xhtml'] = 'Renderitzador que cal utilitzar per a la sortida principal (xhtml) del wiki'; -$lang['renderer__core'] = '% (ànima del dokuwiki)'; -$lang['renderer__plugin'] = '% (connector)'; +$lang['renderer__core'] = '%s (ànima del dokuwiki)'; +$lang['renderer__plugin'] = '%s (connector)'; $lang['rememberme'] = 'Permet galetes de sessió permanents ("recorda\'m")'; $lang['rss_type'] = 'Tipus de canal XML'; $lang['rss_linkto'] = 'Destinació dels enllaços en el canal XML'; diff --git a/lib/plugins/plugin/lang/es/lang.php b/lib/plugins/plugin/lang/es/lang.php index 53d6d63fd..ac548245b 100644 --- a/lib/plugins/plugin/lang/es/lang.php +++ b/lib/plugins/plugin/lang/es/lang.php @@ -67,4 +67,4 @@ $lang['enabled'] = 'Plugin %s habilitado.'; $lang['notenabled'] = 'Plugin %s no puede ser habilitado, verifica los permisos del archivo.'; $lang['disabled'] = 'Plugin %s desabilitado.'; $lang['notdisabled'] = 'Plugin %s no puede ser desabilitado, verifica los permisos de archivo.'; -$lang['packageinstalled'] = 'Plugin (%d plugin%s: %s) instalado exitosamente.'; +$lang['packageinstalled'] = 'Plugin (%d plugin(s): %s) instalado exitosamente.'; diff --git a/lib/plugins/plugin/lang/eu/lang.php b/lib/plugins/plugin/lang/eu/lang.php index ebcda7e16..56c03325f 100644 --- a/lib/plugins/plugin/lang/eu/lang.php +++ b/lib/plugins/plugin/lang/eu/lang.php @@ -48,4 +48,4 @@ $lang['enabled'] = '%s Plugin-a gaitua.'; $lang['notenabled'] = '%s Plugin-a ezin izan da gaitu, egiaztatu fitxategi baimenak.'; $lang['disabled'] = '%s Plugin-a ezgaitua.'; $lang['notdisabled'] = '%s Plugin-a ezin izan da ezgaitu, egiaztatu fitxategi baimenak. '; -$lang['packageinstalled'] = 'Plugin paketea (%d plugin%s: %s) arrakastaz instalatua izan da.'; +$lang['packageinstalled'] = 'Plugin paketea (%d plugin(s): %s) arrakastaz instalatua izan da.'; diff --git a/lib/plugins/plugin/lang/fa/lang.php b/lib/plugins/plugin/lang/fa/lang.php index 19a839660..8f3fb8a41 100644 --- a/lib/plugins/plugin/lang/fa/lang.php +++ b/lib/plugins/plugin/lang/fa/lang.php @@ -52,4 +52,4 @@ $lang['enabled'] = 'افزونه‌ی %s فعال شد.'; $lang['notenabled'] = 'افزونه‌ی %s قابلیت فعال کردن ندارد، دسترسی‌ها را چک کنید.'; $lang['disabled'] = 'افزونه‌ی %s غیرفعال شد.'; $lang['notdisabled'] = 'افزونه‌ی %s قابلیت غیرفعال کردن ندارد، دسترسی‌ها را چک کنید.'; -$lang['packageinstalled'] = 'بسته افزونه (%d افزونه%s: %s) به درستی نصب شد.'; +$lang['packageinstalled'] = 'بسته افزونه (%d افزونه: %s) به درستی نصب شد.'; diff --git a/lib/plugins/plugin/lang/hu/lang.php b/lib/plugins/plugin/lang/hu/lang.php index 25c7b6322..34309a53f 100644 --- a/lib/plugins/plugin/lang/hu/lang.php +++ b/lib/plugins/plugin/lang/hu/lang.php @@ -53,4 +53,4 @@ $lang['enabled'] = 'A(z) %s bővítmény bekapcsolva.'; $lang['notenabled'] = 'A(z) %s bővítmény engedélyezése nem sikerült. Ellenőrizze a fájl-hozzáférési engedélyeket.'; $lang['disabled'] = 'A(z) %s bővítmény kikapcsolva.'; $lang['notdisabled'] = 'A(z) %s bővítmény kikapcsolása nem sikerült. Ellenőrizze a fájl-hozzáférési engedélyeket.'; -$lang['packageinstalled'] = 'A bővítmény csomag(ok) feltelepült(ek): %d plugin%s: %s'; +$lang['packageinstalled'] = 'A bővítmény csomag(ok) feltelepült(ek): %d plugin(s): %s'; diff --git a/lib/plugins/plugin/lang/ja/lang.php b/lib/plugins/plugin/lang/ja/lang.php index 56a827b7e..a96dcc9be 100644 --- a/lib/plugins/plugin/lang/ja/lang.php +++ b/lib/plugins/plugin/lang/ja/lang.php @@ -53,4 +53,4 @@ $lang['enabled'] = 'プラグイン %s が有効です。'; $lang['notenabled'] = 'プラグイン %s を有効にすることができません。権限を確認してください。'; $lang['disabled'] = 'プラグイン %s が無効です。'; $lang['notdisabled'] = 'プラグイン %s を無効にすることができません。権限を確認してください。'; -$lang['packageinstalled'] = 'プラグインパッケージ（%d plugin%s: %s）は正しくインストールされました。'; +$lang['packageinstalled'] = 'プラグインパッケージ（%d plugin(s): %s）は正しくインストールされました。'; diff --git a/lib/plugins/plugin/lang/ko/lang.php b/lib/plugins/plugin/lang/ko/lang.php index ab305dcd8..c77c3259d 100644 --- a/lib/plugins/plugin/lang/ko/lang.php +++ b/lib/plugins/plugin/lang/ko/lang.php @@ -53,4 +53,4 @@ $lang['enabled'] = '%s 플러그인을 켰습니다.'; $lang['notenabled'] = '%s 플러그인을 킬 수 없습니다. 파일 권한을 확인하십시오.'; $lang['disabled'] = '%s 플러그인을 껐습니다.'; $lang['notdisabled'] = '%s 플러그인을 끌 수 없습니다. 파일 권한을 확인하십시오.'; -$lang['packageinstalled'] = '플러그인 패키지(%d 개의 플러그인%s: %s)가 성공적으로 설치되었습니다.'; +$lang['packageinstalled'] = '플러그인 패키지(%d 개의 플러그인: %s)가 성공적으로 설치되었습니다.'; diff --git a/lib/plugins/plugin/lang/mk/lang.php b/lib/plugins/plugin/lang/mk/lang.php index 85f73a09f..747d61638 100644 --- a/lib/plugins/plugin/lang/mk/lang.php +++ b/lib/plugins/plugin/lang/mk/lang.php @@ -19,13 +19,13 @@ $lang['lastupdate'] = 'Последно ажурирани:'; $lang['source'] = 'Извор:'; $lang['unknown'] = 'непознат'; $lang['updating'] = 'Ажурирам...'; -$lang['updated'] = 'Приклучокот % е успешно ажуриран'; +$lang['updated'] = 'Приклучокот %s е успешно ажуриран'; $lang['updates'] = 'Следниве приклучоци се успешно ажурирани'; $lang['update_none'] = 'Нема потребни ажурирања.'; $lang['deleting'] = 'Бришам...'; $lang['deleted'] = 'Приклучокот %s е избришан.'; $lang['downloading'] = 'Симнувам...'; -$lang['downloaded'] = 'Приклучокот % е успешно инсталиран'; +$lang['downloaded'] = 'Приклучокот %s е успешно инсталиран'; $lang['downloads'] = 'Следниве приклучоци се успешно инсталирани'; $lang['download_none'] = 'Нема пронајдени приклучоци, или имаше непознат проблем при симнување и инсталирање.'; $lang['plugin'] = 'Приклучок:'; diff --git a/lib/plugins/plugin/lang/nl/lang.php b/lib/plugins/plugin/lang/nl/lang.php index d13e46ff8..18662e15b 100644 --- a/lib/plugins/plugin/lang/nl/lang.php +++ b/lib/plugins/plugin/lang/nl/lang.php @@ -57,4 +57,4 @@ $lang['enabled'] = 'Plugin %s ingeschakeld.'; $lang['notenabled'] = 'Plugin %s kon niet worden ingeschakeld, controleer bestandsrechten.'; $lang['disabled'] = 'Plugin %s uitgeschakeld.'; $lang['notdisabled'] = 'Plugin %s kon niet worden uitgeschakeld, controleer bestandsrechten.'; -$lang['packageinstalled'] = 'Plugin package (%d plugin%s: %s) succesvol geïnstalleerd.'; +$lang['packageinstalled'] = 'Plugin package (%d plugin(s): %s) succesvol geïnstalleerd.'; diff --git a/lib/plugins/plugin/lang/pl/lang.php b/lib/plugins/plugin/lang/pl/lang.php index f48426bf6..a84c55190 100644 --- a/lib/plugins/plugin/lang/pl/lang.php +++ b/lib/plugins/plugin/lang/pl/lang.php @@ -56,5 +56,5 @@ $lang['error_copy'] = 'Wystąpił błąd podczas kopiowania pliku w t $lang['error_delete'] = 'Wystąpił błąd przy próbie usunięcia wtyczki %s. Prawdopodobną przyczyną są niewystarczające uprawnienia do katalogu.'; $lang['enabled'] = 'Wtyczka %s włączona.'; $lang['notenabled'] = 'Nie udało się uruchomić wtyczki %s, sprawdź uprawnienia dostępu do plików.'; -$lang['disabled'] = 'Wtyczka % wyłączona.'; +$lang['disabled'] = 'Wtyczka %s wyłączona.'; $lang['notdisabled'] = 'Nie udało się wyłączyć wtyczki %s, sprawdź uprawnienia dostępu do plików.'; diff --git a/lib/plugins/plugin/lang/pt-br/lang.php b/lib/plugins/plugin/lang/pt-br/lang.php index e8b23dae9..26e73f4fc 100644 --- a/lib/plugins/plugin/lang/pt-br/lang.php +++ b/lib/plugins/plugin/lang/pt-br/lang.php @@ -61,4 +61,4 @@ $lang['enabled'] = 'O plug-in %s foi habilitado.'; $lang['notenabled'] = 'Não foi possível habilitar o plug-in %s. Verifique as permissões de acesso.'; $lang['disabled'] = 'O plug-in %s foi desabilitado.'; $lang['notdisabled'] = 'Não foi possível desabilitar o plug-in %s. Verifique as permissões de acesso.'; -$lang['packageinstalled'] = 'O pacote do plugin (%d plugin%s: %s) foi instalado com sucesso.'; +$lang['packageinstalled'] = 'O pacote do plugin (%d plugin(s): %s) foi instalado com sucesso.'; diff --git a/lib/plugins/plugin/lang/pt/lang.php b/lib/plugins/plugin/lang/pt/lang.php index 1567741f9..dccd4f738 100644 --- a/lib/plugins/plugin/lang/pt/lang.php +++ b/lib/plugins/plugin/lang/pt/lang.php @@ -52,4 +52,4 @@ $lang['enabled'] = 'Plugin %s habilitado.'; $lang['notenabled'] = 'Plugin %s não pôde ser habilitado, verifique as permissões.'; $lang['disabled'] = 'Plugin %s desabilitado.'; $lang['notdisabled'] = 'Plugin %s não pôde ser desabilitado, verifique as permissões.'; -$lang['packageinstalled'] = 'Pacote de Plugins (%d plugin%s: %s) instalado com sucesso.'; +$lang['packageinstalled'] = 'Pacote de Plugins (%d plugin(s): %s) instalado com sucesso.'; diff --git a/lib/plugins/plugin/lang/sk/lang.php b/lib/plugins/plugin/lang/sk/lang.php index 7a8f32a53..5024872f1 100644 --- a/lib/plugins/plugin/lang/sk/lang.php +++ b/lib/plugins/plugin/lang/sk/lang.php @@ -51,4 +51,4 @@ $lang['enabled'] = 'Plugin %s aktivovaný.'; $lang['notenabled'] = 'Plugin %s nemôže byť aktivovaný, skontrolujte prístupové práva.'; $lang['disabled'] = 'Plugin %s deaktivovaný.'; $lang['notdisabled'] = 'Plugin %s nemôže byť deaktivovaný, skontrolujte prístupové práva.'; -$lang['packageinstalled'] = 'Plugin package (%d plugin%s: %s) úspešne inštalovaný.'; +$lang['packageinstalled'] = 'Plugin package (%d plugin(s): %s) úspešne inštalovaný.'; diff --git a/lib/plugins/plugin/lang/uk/lang.php b/lib/plugins/plugin/lang/uk/lang.php index 69ee9ded1..036900f4e 100644 --- a/lib/plugins/plugin/lang/uk/lang.php +++ b/lib/plugins/plugin/lang/uk/lang.php @@ -55,4 +55,4 @@ $lang['enabled'] = 'Доданок %s увімкнено.'; $lang['notenabled'] = 'Не вдається увімкнути доданок %s. Перевірте права доступу до файлу.'; $lang['disabled'] = 'Доданок %s вимкнено.'; $lang['notdisabled'] = 'Не вдається вимкнути доданок %s. Перевірте права доступу до файлу.'; -$lang['packageinstalled'] = 'Пакет плагінів (%d plugin%s: %s) успішно встановлений.'; +$lang['packageinstalled'] = 'Пакет плагінів (%d plugin(s): %s) успішно встановлений.'; diff --git a/lib/plugins/plugin/lang/zh-tw/lang.php b/lib/plugins/plugin/lang/zh-tw/lang.php index 54234212d..3c4827000 100644 --- a/lib/plugins/plugin/lang/zh-tw/lang.php +++ b/lib/plugins/plugin/lang/zh-tw/lang.php @@ -54,4 +54,4 @@ $lang['enabled'] = '插件 %s 已啟用。'; $lang['notenabled'] = '插件 %s 無法啟用，請檢查檔案權限。'; $lang['disabled'] = '插件 %s 已停用。'; $lang['notdisabled'] = '插件 %s 無法停用，請檢查檔案權限。'; -$lang['packageinstalled'] = '插件 (%d 插件%s: %s) 已成功地安裝。'; +$lang['packageinstalled'] = '插件 (%d 插件: %s) 已成功地安裝。'; diff --git a/lib/plugins/plugin/lang/zh/lang.php b/lib/plugins/plugin/lang/zh/lang.php index f8e0b5568..1263029e0 100644 --- a/lib/plugins/plugin/lang/zh/lang.php +++ b/lib/plugins/plugin/lang/zh/lang.php @@ -59,4 +59,4 @@ $lang['enabled'] = '%s 插件启用'; $lang['notenabled'] = '%s插件启用失败，请检查文件权限。'; $lang['disabled'] = '%s 插件禁用'; $lang['notdisabled'] = '%s插件禁用失败，请检查文件权限。'; -$lang['packageinstalled'] = '插件 (%d plugin%s: %s) 已成功安装。'; +$lang['packageinstalled'] = '插件 (%d plugin(s): %s) 已成功安装。'; diff --git a/lib/plugins/revert/lang/lv/lang.php b/lib/plugins/revert/lang/lv/lang.php index 0101f2698..012d6cc4c 100644 --- a/lib/plugins/revert/lang/lv/lang.php +++ b/lib/plugins/revert/lang/lv/lang.php @@ -8,7 +8,7 @@ $lang['menu'] = 'Piemēsloto lapu atjaunotājs'; $lang['filter'] = 'Meklēt piemēslotās lapas'; $lang['revert'] = 'Atjaunot norādītās lapas '; $lang['reverted'] = '%s atjaunots uz %s stāvokli'; -$lang['removed'] = '% dzēsts'; +$lang['removed'] = '%s dzēsts'; $lang['revstart'] = 'Atjaunošana uzsākta. Tas var aizņemt ilgāku laiku. Ja darbība pārtrūkst noilguma dēļ, atjaunošana jāveic pa mazākām porcijām.'; $lang['revstop'] = 'Atjaunošana veiksmīgi pabeigta. '; $lang['note1'] = 'Ievēro: Meklēšana atšķir lielos un mazos burtus.'; diff --git a/lib/plugins/revert/lang/pt-br/lang.php b/lib/plugins/revert/lang/pt-br/lang.php index 7bdde6675..c4a2f742b 100644 --- a/lib/plugins/revert/lang/pt-br/lang.php +++ b/lib/plugins/revert/lang/pt-br/lang.php @@ -21,7 +21,7 @@ $lang['menu'] = 'Gerenciador de reversões'; $lang['filter'] = 'Procura por páginas com spam'; $lang['revert'] = 'Reverte as páginas selecionadas'; $lang['reverted'] = '%s revertida para a revisão %s'; -$lang['removed'] = '% removida'; +$lang['removed'] = '%s removida'; $lang['revstart'] = 'O processo de reversão foi iniciado. Isso pode levar muito tempo. Se o tempo de execução do script expirar antes dele encerrar, você deverá tentar novamente usando blocos menores.'; $lang['revstop'] = 'O processo de reversão terminou com sucesso.'; $lang['note1'] = 'Nota: esta busca diferencia maiúsculas/minúsculas'; diff --git a/lib/plugins/usermanager/lang/es/lang.php b/lib/plugins/usermanager/lang/es/lang.php index 804df2a4b..c12b77b3d 100644 --- a/lib/plugins/usermanager/lang/es/lang.php +++ b/lib/plugins/usermanager/lang/es/lang.php @@ -49,7 +49,7 @@ $lang['delete_ok'] = '%d usuarios eliminados'; $lang['delete_fail'] = '%d no se pudieron eliminar.'; $lang['update_ok'] = 'Los datos del usuario se actualizaron exitosamente '; $lang['update_fail'] = 'Los datos del usuario no se actualizaron'; -$lang['update_exists'] = 'El cambio de nombre de usuario falló, el nombre especificado ($s) ya está en uso (los otros cambios se aplicaron).'; +$lang['update_exists'] = 'El cambio de nombre de usuario falló, el nombre especificado (%s) ya está en uso (los otros cambios se aplicaron).'; $lang['start'] = 'primera'; $lang['prev'] = 'anterior'; $lang['next'] = 'siguiente'; -- cgit v1.2.3 From 2302fb8dc7877fdf7337d405372ff385bea491d0 Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Sun, 13 Nov 2011 11:04:24 +0100 Subject: fixed german language strings --- inc/lang/de-informal/lang.php | 2 +- inc/lang/de/lang.php | 4 ++-- lib/plugins/plugin/lang/de-informal/lang.php | 2 +- lib/plugins/plugin/lang/de/lang.php | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/inc/lang/de-informal/lang.php b/inc/lang/de-informal/lang.php index ec5e308ce..3779d6fb3 100644 --- a/inc/lang/de-informal/lang.php +++ b/inc/lang/de-informal/lang.php @@ -155,7 +155,7 @@ $lang['uploadsucc'] = 'Datei wurde erfolgreich hochgeladen'; $lang['uploadfail'] = 'Hochladen fehlgeschlagen. Keine Berechtigung?'; $lang['uploadwrong'] = 'Hochladen verweigert. Diese Dateiendung ist nicht erlaubt.'; $lang['uploadexist'] = 'Datei existiert bereits. Keine Änderungen vorgenommen.'; -$lang['uploadbadcontent'] = 'Die hochgeladenen Daten stimmen nicht mit der Dateiendung % überein.'; +$lang['uploadbadcontent'] = 'Die hochgeladenen Daten stimmen nicht mit der Dateiendung %s überein.'; $lang['uploadspam'] = 'Hochladen verweigert: Treffer auf der Spamliste.'; $lang['uploadxss'] = 'Hochladen verweigert: Daten scheinen Schadcode zu enthalten.'; $lang['uploadsize'] = 'Die hochgeladene Datei war zu groß. (max. %s)'; diff --git a/inc/lang/de/lang.php b/inc/lang/de/lang.php index eef2f6632..3bd326c84 100644 --- a/inc/lang/de/lang.php +++ b/inc/lang/de/lang.php @@ -330,8 +330,8 @@ $lang['media_upload'] = 'In den %s Namespace hochladen $lang['media_search'] = 'Im Namespace %s suchen.'; $lang['media_view'] = '%s'; $lang['media_viewold'] = '%s in %s'; -$lang['media_edit'] = 'Bearbeiten'; -$lang['media_history'] = 'Versionsverlauf der Datei.'; +$lang['media_edit'] = '%s bearbeiten'; +$lang['media_history'] = 'Versionsverlauf von %s.'; $lang['media_meta_edited'] = 'Meta-Informationen bearbeitet'; $lang['media_perm_read'] = 'Sie besitzen nicht die notwendigen Berechtigungen um die Datei anzuzeigen.'; $lang['media_perm_upload'] = 'Sie besitzen nicht die notwendigen Berechtigungen um Dateien hochzuladen.'; diff --git a/lib/plugins/plugin/lang/de-informal/lang.php b/lib/plugins/plugin/lang/de-informal/lang.php index 0c7fb5cdf..abcdf2c83 100644 --- a/lib/plugins/plugin/lang/de-informal/lang.php +++ b/lib/plugins/plugin/lang/de-informal/lang.php @@ -53,4 +53,4 @@ $lang['enabled'] = 'Erweiterung %s aktiviert.'; $lang['notenabled'] = 'Erweiterung %s konnte nicht aktiviert werden. Überprüfen sie die Zugriffsberechtigung der Datei.'; $lang['disabled'] = 'Erweiterung %s deaktiviert.'; $lang['notdisabled'] = 'Erweiterung %s konnte nicht deaktiviert werden - überprüfe Dateiberechtigungen'; -$lang['packageinstalled'] = 'Plugin-Paket (%d Plugin%s: %s) erfolgreich installiert.'; +$lang['packageinstalled'] = 'Plugin-Paket (%d Plugin(s): %s) erfolgreich installiert.'; diff --git a/lib/plugins/plugin/lang/de/lang.php b/lib/plugins/plugin/lang/de/lang.php index 75d3eaa93..8708d7836 100644 --- a/lib/plugins/plugin/lang/de/lang.php +++ b/lib/plugins/plugin/lang/de/lang.php @@ -63,4 +63,4 @@ $lang['enabled'] = 'Plugin %s wurde aktiviert.'; $lang['notenabled'] = 'Plugin %s konnte nicht aktiviert werden, überprüfen Sie die Dateirechte.'; $lang['disabled'] = 'Plugin %s wurde deaktiviert.'; $lang['notdisabled'] = 'Plugin %s konnte nicht deaktiviert werden, überprüfen Sie die Dateirechte.'; -$lang['packageinstalled'] = 'Plugin-Paket (%d Plugin%s: %s) erfolgreich installiert.'; +$lang['packageinstalled'] = 'Plugin-Paket (%d Plugin(s): %s) erfolgreich installiert.'; -- cgit v1.2.3 -- cgit v1.2.3 From 6d914084cfecc8f4dbaa39fc7dbb712c86fa27f8 Mon Sep 17 00:00:00 2001 From: Felipe Castro Date: Mon, 14 Nov 2011 14:12:25 +0100 Subject: eo: language updates --- inc/lang/eo/lang.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/inc/lang/eo/lang.php b/inc/lang/eo/lang.php index abb6bf7d7..55bfca22c 100644 --- a/inc/lang/eo/lang.php +++ b/inc/lang/eo/lang.php @@ -255,8 +255,8 @@ $lang['subscr_m_unsubscribe'] = 'Malaboni'; $lang['subscr_m_subscribe'] = 'Aboni'; $lang['subscr_m_receive'] = 'Ricevi'; $lang['subscr_style_every'] = 'retpoŝtaĵo pro ĉiu ŝanĝo'; -$lang['subscr_style_digest'] = 'kolekta retpoŝtaĵo de ŝanĝoj por ĉiu paĝo'; -$lang['subscr_style_list'] = 'listo de ŝanĝitaj paĝoj ekde la lasta retpoŝtaĵo'; +$lang['subscr_style_digest'] = 'resuma retpoŝtaĵo de ŝanĝoj por ĉiu paĝo (je %.2f tagoj)'; +$lang['subscr_style_list'] = 'listo de ŝanĝitaj paĝoj ekde la lasta retpoŝtaĵo (je %.2f tagoj)'; $lang['authmodfailed'] = 'Malbona agordo por identigi la uzanton. Bonvolu informi la administranton de la vikio.'; $lang['authtempfail'] = 'La identigo de via uzantonomo estas intertempe maldisponebla. Se tiu ĉi situacio daŭros, bonvolu informi la adminstranton de la vikio.'; $lang['i_chooselang'] = 'Elektu vian lingvon'; @@ -322,8 +322,8 @@ $lang['media_upload'] = 'Alŝuti al la nomspaco <strong>%s</st $lang['media_search'] = 'Serĉi en la nomspaco <strong>%s</strong>.'; $lang['media_view'] = '%s'; $lang['media_viewold'] = '%s ĉe %s'; -$lang['media_edit'] = 'Modifi'; -$lang['media_history'] = 'Tiuj estas la pli malnovaj revizioj de la dosiero.'; +$lang['media_edit'] = 'Modifi %s'; +$lang['media_history'] = 'Protokolo de %s'; $lang['media_meta_edited'] = 'metadatumoj ŝanĝitaj'; $lang['media_perm_read'] = 'Bedaûrinde viaj rajtoj ne sufiĉas por legi dosierojn.'; $lang['media_perm_upload'] = 'Bedaûrinde viaj rajtoj ne sufiĉas por alŝuti dosierojn.'; -- cgit v1.2.3 From a4e0e797f6bce4aaabf4e115a277db8c9a1fa285 Mon Sep 17 00:00:00 2001 From: Dominik Eckelmann Date: Sat, 19 Nov 2011 14:40:11 +0100 Subject: enabled remote as plugintype --- inc/init.php | 2 +- inc/load.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/inc/init.php b/inc/init.php index b3acf2e33..ba62fe079 100644 --- a/inc/init.php +++ b/inc/init.php @@ -200,7 +200,7 @@ init_paths(); init_files(); // setup plugin controller class (can be overwritten in preload.php) -$plugin_types = array('admin','syntax','action','renderer', 'helper'); +$plugin_types = array('admin','syntax','action','renderer', 'helper','remote'); global $plugin_controller_class, $plugin_controller; if (empty($plugin_controller_class)) $plugin_controller_class = 'Doku_Plugin_Controller'; diff --git a/inc/load.php b/inc/load.php index d30397f6e..b69d58140 100644 --- a/inc/load.php +++ b/inc/load.php @@ -89,7 +89,7 @@ function load_autoload($name){ } // Plugin loading - if(preg_match('/^(helper|syntax|action|admin|renderer)_plugin_([^_]+)(?:_([^_]+))?$/', + if(preg_match('/^(helper|syntax|action|admin|renderer|remote)_plugin_([^_]+)(?:_([^_]+))?$/', $name, $m)) { //try to load the wanted plugin file // include, but be silent. Maybe some other autoloader has an idea -- cgit v1.2.3 From 1017f6f159386699a10d2529c50fb5e28b5c1889 Mon Sep 17 00:00:00 2001 From: Dominik Eckelmann Date: Sat, 19 Nov 2011 14:40:29 +0100 Subject: begin with remote api --- inc/remote.php | 120 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 120 insertions(+) create mode 100644 inc/remote.php diff --git a/inc/remote.php b/inc/remote.php new file mode 100644 index 000000000..ea5e23af3 --- /dev/null +++ b/inc/remote.php @@ -0,0 +1,120 @@ + array( + * 'args' => array( + * 'type' => 'string|int|...', + * ) + * ) + * ) + * + * plugin names are formed the following: + * core methods begin by a 'dokuwiki' or 'wiki' followed by a . and the method name itself. + * i.e.: dokuwiki.version or wiki.getPage + * + * plugin methods are formed like 'plugin..'. + * i.e.: plugin.clock.getTime or plugin.clock_gmt.getTime + * + * + * + * @throws RemoteException + */ +class RemoteAPI { + + /** + * @var array remote methods provided by dokuwiki. + */ + private $coreMethods = array(); + + /** + * @var array remote methods provided by dokuwiki plugins - will be filled lazy via + * {@see RemoteAPI#getPluginMethods} + */ + private $pluginMethods = null; + + /** + * Get all available methods with remote access. + * + * @return array with information to all available methods + */ + public function getMethods() { + $this->forceAccess(); + return array_merge($this->getCoreMethods(), $this->getPluginMethods()); + } + + /** + * call a method via remote api. + * + * @param string $method name of the method to call. + * @param array $args arguments to pass to the given method + * @return mixed result of method call, must be a primitive type. + */ + public function call($method, $args) { + $this->forceAccess(); + $method = explode('.', $method); + if ($method[0] === 'plugin') { + $plugin = plugin_load('remote', $method[1]); + if (!$plugin) { + throw new RemoteException('Method unavailable'); + } + return call_user_func_array(array($plugin, $method[2]), $args); + } else { + // TODO call core method + } + + } + + /** + * @return bool true if the current user has access to remote api. + */ + public function hasAccess() { + global $conf; + if (!isset($conf['remote'])) { + return false; + } + return $conf['remote']; + } + + /** + * @throws RemoteException On denied access. + * @return void + */ + private function forceAccess() { + if (!$this->hasAccess()) { + throw new RemoteException('Access denied'); + } + } + + /** + * @return array all plugin methods. + */ + public function getPluginMethods() { + if ($this->pluginMethods === null) { + // TODO: find plugin methods + $this->pluginMethods = array(); + } + return $this->pluginMethods; + } + + /** + * @return array all core methods. + */ + public function getCoreMethods() { + return $this->coreMethods; + } +} + + +class RemoteException extends Exception {} \ No newline at end of file -- cgit v1.2.3 From fb286077fc5fb32f16fdd1b2f0cb7543e583cdda Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Sun, 20 Nov 2011 17:06:57 +0000 Subject: removed obsolete styles for link wizard --- lib/tpl/default/_linkwiz.css | 29 ----------------------------- 1 file changed, 29 deletions(-) diff --git a/lib/tpl/default/_linkwiz.css b/lib/tpl/default/_linkwiz.css index fd40a0019..ca8812867 100644 --- a/lib/tpl/default/_linkwiz.css +++ b/lib/tpl/default/_linkwiz.css @@ -1,27 +1,4 @@ #link__wiz { - position: absolute; - display: block; - z-index: 99; - width: 300px; - height: 250px; - padding: 0; - margin: 0; - overflow: hidden; - border: 1px solid __border__; - background-color: __background_neu__; - text-align: center; -} - -#link__wiz_header { - background-color: __background_alt__; - height: 16px; - margin-bottom: 5px; - cursor: move; -} - -#link__wiz_close { - cursor: pointer; - margin: 0; } #link__wiz_result { @@ -61,9 +38,3 @@ display: block; color: __text_neu__; } - -/*FIXME maybe move to a more general style sheet*/ -.ondrag { - cursor: move; - opacity: 0.8; -} -- cgit v1.2.3 From 457ad80ad7c53870fc033997bfbf36e3904f9c4e Mon Sep 17 00:00:00 2001 From: Dominik Eckelmann Date: Wed, 23 Nov 2011 20:25:58 +0100 Subject: introduced remote api class --- _test/index.php | 2 +- inc/load.php | 2 ++ inc/remote.php | 15 ++++++++++++++- 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/_test/index.php b/_test/index.php index f59c44cf4..64ece4762 100644 --- a/_test/index.php +++ b/_test/index.php @@ -11,7 +11,7 @@ if(@file_exists(DOKU_CONF.'local.php')){ require_once(DOKU_CONF.'local.php'); } $conf['lang'] = 'en'; define('TEST_ROOT', dirname(__FILE__)); define('TMPL_FILESCHEME_PATH', TEST_ROOT . '/filescheme/'); -error_reporting(E_ALL); +error_reporting(E_ALL & ~E_DEPRECATED); set_time_limit(600); ini_set('memory_limit','128M'); diff --git a/inc/load.php b/inc/load.php index b69d58140..3f1f3429f 100644 --- a/inc/load.php +++ b/inc/load.php @@ -76,10 +76,12 @@ function load_autoload($name){ 'SafeFN' => DOKU_INC.'inc/SafeFN.class.php', 'Sitemapper' => DOKU_INC.'inc/Sitemapper.php', 'PassHash' => DOKU_INC.'inc/PassHash.class.php', + 'RemoteAPI' => DOKU_INC.'inc/remote.php', 'DokuWiki_Action_Plugin' => DOKU_PLUGIN.'action.php', 'DokuWiki_Admin_Plugin' => DOKU_PLUGIN.'admin.php', 'DokuWiki_Syntax_Plugin' => DOKU_PLUGIN.'syntax.php', + 'DokuWiki_Remote_Plugin' => DOKU_PLUGIN.'remote.php', ); diff --git a/inc/remote.php b/inc/remote.php index ea5e23af3..13a38aa17 100644 --- a/inc/remote.php +++ b/inc/remote.php @@ -17,6 +17,7 @@ if (!defined('DOKU_INC')) die(); * 'args' => array( * 'type' => 'string|int|...', * ) + * 'return' => 'type' * ) * ) * @@ -102,8 +103,20 @@ class RemoteAPI { */ public function getPluginMethods() { if ($this->pluginMethods === null) { - // TODO: find plugin methods $this->pluginMethods = array(); + $plugins = plugin_list('remote'); + + foreach ($plugins as $pluginName) { + $plugin = plugin_load('remote', $pluginName); + if (!is_subclass_of($plugin, 'DokuWiki_Remote_Plugin')) { + throw new RemoteException("Plugin $pluginName dose not implement DokuWiki_Remote_Plugin"); + } + + $methods = $plugin->_getMethods(); + foreach ($methods as $method => $meta) { + $this->pluginMethods["plugin.$pluginName.$method"] = $meta; + } + } } return $this->pluginMethods; } -- cgit v1.2.3 From 9ebae2ae295f745e1c3f257a52551b65e791f852 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Elan=20Ruusam=C3=A4e?= Date: Thu, 24 Nov 2011 00:16:01 +0200 Subject: fix jQuery capitalization --- lib/scripts/compatibility.js | 2 +- lib/scripts/page.js | 2 +- lib/scripts/qsearch.js | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/scripts/compatibility.js b/lib/scripts/compatibility.js index ea52153c5..385e45854 100644 --- a/lib/scripts/compatibility.js +++ b/lib/scripts/compatibility.js @@ -49,7 +49,7 @@ function DEPRECATED_WRAP(func, context) { * @link http://prototype.conio.net/ */ function $() { - DEPRECATED('Please use the JQuery() function instead.'); + DEPRECATED('Please use the jQuery() function instead.'); var elements = new Array(); diff --git a/lib/scripts/page.js b/lib/scripts/page.js index e4033b76d..55a844f0b 100644 --- a/lib/scripts/page.js +++ b/lib/scripts/page.js @@ -43,7 +43,7 @@ dw_page = { * * @param target - the DOM element at which the popup should be aligned at * @param popup_id - the ID of the (new) DOM popup - * @return the Popup JQuery object + * @return the Popup jQuery object */ insituPopup: function(target, popup_id) { // get or create the popup div diff --git a/lib/scripts/qsearch.js b/lib/scripts/qsearch.js index c7128b9e3..a309f9e29 100644 --- a/lib/scripts/qsearch.js +++ b/lib/scripts/qsearch.js @@ -18,8 +18,8 @@ var dw_qsearch = { * * Attaches the event handlers * - * @param input element (JQuery selector/DOM obj) - * @param output element (JQuery selector/DOM obj) + * @param input element (jQuery selector/DOM obj) + * @param output element (jQuery selector/DOM obj) */ init: function (input, output) { var do_qsearch; -- cgit v1.2.3 From dacedfc0b083d926504ef07024b17d8d036564cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Elan=20Ruusam=C3=A4e?= Date: Thu, 24 Nov 2011 22:16:51 +0200 Subject: add label to each plugin in plugin management page i needed to disable all plugins to figure out which plugin was causing template error, so it was quite annoying to click on the tiny checkbox added html label so i could at least click on the plugin name to toggle checkbox state --- lib/plugins/plugin/classes/ap_manage.class.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/plugins/plugin/classes/ap_manage.class.php b/lib/plugins/plugin/classes/ap_manage.class.php index fb148f263..12480e922 100644 --- a/lib/plugins/plugin/classes/ap_manage.class.php +++ b/lib/plugins/plugin/classes/ap_manage.class.php @@ -90,8 +90,8 @@ class ap_manage { ptln(' '); ptln(' '.$plugin.''); - ptln(' '); - ptln('

'.$plugin.'

'); + ptln(' '); + ptln('

'); $this->html_button($plugin, 'info', false, 6); if (in_array('settings', $this->manager->functions)) { -- cgit v1.2.3 From 5505dd9afd380c1676d9d0cef3e10d5be06ffee2 Mon Sep 17 00:00:00 2001 From: Tim Roes Date: Sun, 27 Nov 2011 01:22:40 +0100 Subject: Fixed XML-RPC getAttachment method. Without creating an IXR_Base64 object, the file will be encoded as base64, but send as string. The client XML-RPC parser cannot detect that it is meant to be a base64 encoded file. --- lib/exe/xmlrpc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/exe/xmlrpc.php b/lib/exe/xmlrpc.php index e5e3298ae..3a05c886d 100644 --- a/lib/exe/xmlrpc.php +++ b/lib/exe/xmlrpc.php @@ -311,7 +311,7 @@ class dokuwiki_xmlrpc_server extends IXR_IntrospectionServer { return new IXR_Error(1, 'The requested file does not exist'); $data = io_readFile($file, false); - $base64 = base64_encode($data); + $base64 = new IXR_Base64($data); return $base64; } -- cgit v1.2.3 From 502a92e072be7b42750b4c9032e7269d1fd7c7b4 Mon Sep 17 00:00:00 2001 From: Patrick Michel Date: Sun, 27 Nov 2011 10:55:27 +0100 Subject: MD5 password hash format of the LDAP RFC FS#2378 This implements the salted MD5 password hash format of the LDAP RFC. The format is quite simple the password, followed by the 8 byte hash in base64 encoding, which results in 32 characters, prepended with the string "{smd5}". --- inc/PassHash.class.php | 15 +++++++++++++++ lib/plugins/config/settings/config.metadata.php | 2 +- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/inc/PassHash.class.php b/inc/PassHash.class.php index 31493c022..c13cf4a54 100644 --- a/inc/PassHash.class.php +++ b/inc/PassHash.class.php @@ -50,6 +50,9 @@ class PassHash { }elseif(substr($hash,0,6) == '{SSHA}'){ $method = 'ssha'; $salt = substr(base64_decode(substr($hash, 6)),20); + }elseif(substr($hash,0,6) == '{SMD5}'){ + $method = 'smd6'; + $salt = substr(base64_decode(substr($hash, 6)),16); }elseif($len == 32){ $method = 'md5'; }elseif($len == 40){ @@ -130,6 +133,18 @@ class PassHash { } } + + /** + * Password hashing method 'smd6' + * + * Uses salted MD5 hashs. Salt is 8 bytes long. Yes, really 8 bytes... + */ + public function hash_smd6($clear, $salt=null){ + $this->init_salt($salt,8); + return "{SMD5}".base64_encode(md5($clear.$salt, true).$salt); + } + + /** * Password hashing method 'apr1' * diff --git a/lib/plugins/config/settings/config.metadata.php b/lib/plugins/config/settings/config.metadata.php index 5f2c32ea7..c943a2fad 100644 --- a/lib/plugins/config/settings/config.metadata.php +++ b/lib/plugins/config/settings/config.metadata.php @@ -123,7 +123,7 @@ $meta['_authentication'] = array('fieldset'); $meta['useacl'] = array('onoff'); $meta['autopasswd'] = array('onoff'); $meta['authtype'] = array('authtype'); -$meta['passcrypt'] = array('multichoice','_choices' => array('smd5','md5','apr1','sha1','ssha','crypt','mysql','my411','kmd5','pmd5','hmd5')); +$meta['passcrypt'] = array('multichoice','_choices' => array('smd5','smd6','md5','apr1','sha1','ssha','crypt','mysql','my411','kmd5','pmd5','hmd5')); $meta['defaultgroup']= array('string'); $meta['superuser'] = array('string'); $meta['manager'] = array('string'); -- cgit v1.2.3 From 491a2c68bc685e7e0cd4f9622ef4051e4a580d62 Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Sun, 27 Nov 2011 11:08:07 +0100 Subject: renamed passhash method smd6 to lsmd5 --- inc/PassHash.class.php | 14 ++++++++------ lib/plugins/config/settings/config.metadata.php | 2 +- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/inc/PassHash.class.php b/inc/PassHash.class.php index c13cf4a54..8f62425aa 100644 --- a/inc/PassHash.class.php +++ b/inc/PassHash.class.php @@ -51,7 +51,7 @@ class PassHash { $method = 'ssha'; $salt = substr(base64_decode(substr($hash, 6)),20); }elseif(substr($hash,0,6) == '{SMD5}'){ - $method = 'smd6'; + $method = 'lsmd5'; $salt = substr(base64_decode(substr($hash, 6)),16); }elseif($len == 32){ $method = 'md5'; @@ -135,13 +135,15 @@ class PassHash { /** - * Password hashing method 'smd6' + * Password hashing method 'lsmd5' * - * Uses salted MD5 hashs. Salt is 8 bytes long. Yes, really 8 bytes... + * Uses salted MD5 hashs. Salt is 8 bytes long. + * + * This is the format used by LDAP. */ - public function hash_smd6($clear, $salt=null){ - $this->init_salt($salt,8); - return "{SMD5}".base64_encode(md5($clear.$salt, true).$salt); + public function hash_lsmd5($clear, $salt=null){ + $this->init_salt($salt,8); + return "{SMD5}".base64_encode(md5($clear.$salt, true).$salt); } diff --git a/lib/plugins/config/settings/config.metadata.php b/lib/plugins/config/settings/config.metadata.php index c943a2fad..0315ecae6 100644 --- a/lib/plugins/config/settings/config.metadata.php +++ b/lib/plugins/config/settings/config.metadata.php @@ -123,7 +123,7 @@ $meta['_authentication'] = array('fieldset'); $meta['useacl'] = array('onoff'); $meta['autopasswd'] = array('onoff'); $meta['authtype'] = array('authtype'); -$meta['passcrypt'] = array('multichoice','_choices' => array('smd5','smd6','md5','apr1','sha1','ssha','crypt','mysql','my411','kmd5','pmd5','hmd5')); +$meta['passcrypt'] = array('multichoice','_choices' => array('smd5','md5','apr1','sha1','ssha','lsmd5','crypt','mysql','my411','kmd5','pmd5','hmd5')); $meta['defaultgroup']= array('string'); $meta['superuser'] = array('string'); $meta['manager'] = array('string'); -- cgit v1.2.3 From c8ca60df97ff2b24091c7c0d0db72c680200ea1b Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Sun, 27 Nov 2011 11:08:44 +0100 Subject: added test case for lsmd5 passhashing --- _test/cases/inc/auth_password.test.php | 1 + 1 file changed, 1 insertion(+) diff --git a/_test/cases/inc/auth_password.test.php b/_test/cases/inc/auth_password.test.php index 928552a14..6c643a7ed 100644 --- a/_test/cases/inc/auth_password.test.php +++ b/_test/cases/inc/auth_password.test.php @@ -12,6 +12,7 @@ class auth_password_test extends UnitTestCase { 'md5' => '8fa22d62408e5351553acdd91c6b7003', 'sha1' => 'b456d3b0efd105d613744ffd549514ecafcfc7e1', 'ssha' => '{SSHA}QMHG+uC7bHNYKkmoLbNsNI38/dJhYmNk', + 'lsmd5' => '{SMD5}HGbkPrkWgy9KgcRGWlrsUWFiY2RlZmdo', 'crypt' => 'ablvoGr1hvZ5k', 'mysql' => '4a1fa3780bd6fd55', 'my411' => '*e5929347e25f82e19e4ebe92f1dc6b6e7c2dbd29', -- cgit v1.2.3 From 612db7146659fb98db1eff83d71e668e6f2da9fc Mon Sep 17 00:00:00 2001 From: Shuo Ting Jian Date: Sun, 27 Nov 2011 11:19:12 +0100 Subject: Chinese language update --- inc/lang/zh/lang.php | 15 ++++++++++----- lib/plugins/acl/lang/zh/lang.php | 1 + lib/plugins/config/lang/zh/lang.php | 1 + lib/plugins/plugin/lang/zh/lang.php | 3 ++- lib/plugins/popularity/lang/zh/lang.php | 1 + lib/plugins/revert/lang/zh/lang.php | 1 + lib/plugins/usermanager/lang/zh/lang.php | 1 + 7 files changed, 17 insertions(+), 6 deletions(-) diff --git a/inc/lang/zh/lang.php b/inc/lang/zh/lang.php index 6e6dff6f4..95d1bc2c5 100644 --- a/inc/lang/zh/lang.php +++ b/inc/lang/zh/lang.php @@ -14,6 +14,7 @@ * @author Hiphen Lee * @author caii, patent agent in China * @author lainme993@gmail.com + * @author Shuo-Ting Jian */ $lang['encoding'] = 'utf-8'; $lang['direction'] = 'ltr'; @@ -315,18 +316,22 @@ $lang['seconds'] = '%d秒前'; $lang['wordblock'] = '您的更改没有被保存，因为它包含被屏蔽的文字（垃圾信息）。'; $lang['media_uploadtab'] = '上传'; $lang['media_searchtab'] = '搜索'; +$lang['media_file'] = '文件'; $lang['media_viewtab'] = '查看'; $lang['media_edittab'] = '编辑'; $lang['media_historytab'] = '历史'; -$lang['media_thumbsview'] = '缩略图'; -$lang['media_listview'] = '列表'; -$lang['media_sort'] = '排序'; +$lang['media_list_thumbs'] = '缩图'; +$lang['media_list_rows'] = '列表'; $lang['media_sort_name'] = '按名称'; $lang['media_sort_date'] = '按日期'; +$lang['media_namespaces'] = '选择命名空间'; +$lang['media_files'] = '在 %s 中的文件'; $lang['media_upload'] = '上传到 %s 命名空间。'; $lang['media_search'] = '在 %s 命名空间中搜索。'; -$lang['media_edit'] = '编辑'; -$lang['media_history'] = '这些是文件的旧版本。'; +$lang['media_view'] = '%s 在 %s'; +$lang['media_viewold'] = '%s '; +$lang['media_edit'] = '编辑 %s'; +$lang['media_history'] = '%s 的历史纪录'; $lang['media_meta_edited'] = '元数据已编辑'; $lang['media_perm_read'] = '抱歉，您没有足够权限读取这些文件。'; $lang['media_perm_upload'] = '抱歉，您没有足够权限来上传文件。'; diff --git a/lib/plugins/acl/lang/zh/lang.php b/lib/plugins/acl/lang/zh/lang.php index 986fa769a..983882eaf 100644 --- a/lib/plugins/acl/lang/zh/lang.php +++ b/lib/plugins/acl/lang/zh/lang.php @@ -14,6 +14,7 @@ * @author Hiphen Lee * @author caii, patent agent in China * @author lainme993@gmail.com + * @author Shuo-Ting Jian */ $lang['admin_acl'] = '访问控制列表（ACL）管理器'; $lang['acl_group'] = '组'; diff --git a/lib/plugins/config/lang/zh/lang.php b/lib/plugins/config/lang/zh/lang.php index 7a7f0f504..2f6444ffa 100644 --- a/lib/plugins/config/lang/zh/lang.php +++ b/lib/plugins/config/lang/zh/lang.php @@ -14,6 +14,7 @@ * @author Hiphen Lee * @author caii, patent agent in China * @author lainme993@gmail.com + * @author Shuo-Ting Jian */ $lang['menu'] = '配置设置'; $lang['error'] = '由于非法参数，设置没有更新。请检查您做的改动并重新提交。 diff --git a/lib/plugins/plugin/lang/zh/lang.php b/lib/plugins/plugin/lang/zh/lang.php index 1263029e0..58f05fbd9 100644 --- a/lib/plugins/plugin/lang/zh/lang.php +++ b/lib/plugins/plugin/lang/zh/lang.php @@ -14,6 +14,7 @@ * @author Hiphen Lee * @author caii, patent agent in China * @author lainme993@gmail.com + * @author Shuo-Ting Jian */ $lang['menu'] = '插件管理器'; $lang['download'] = '下载并安装新的插件'; @@ -59,4 +60,4 @@ $lang['enabled'] = '%s 插件启用'; $lang['notenabled'] = '%s插件启用失败，请检查文件权限。'; $lang['disabled'] = '%s 插件禁用'; $lang['notdisabled'] = '%s插件禁用失败，请检查文件权限。'; -$lang['packageinstalled'] = '插件 (%d plugin(s): %s) 已成功安装。'; +$lang['packageinstalled'] = '插件 (%d plugin%s: %s) 已成功安装。'; diff --git a/lib/plugins/popularity/lang/zh/lang.php b/lib/plugins/popularity/lang/zh/lang.php index f45aaf4ff..9c916c2a5 100644 --- a/lib/plugins/popularity/lang/zh/lang.php +++ b/lib/plugins/popularity/lang/zh/lang.php @@ -13,6 +13,7 @@ * @author Hiphen Lee * @author caii, patent agent in China * @author lainme993@gmail.com + * @author Shuo-Ting Jian */ $lang['name'] = '人气反馈（载入可能需要一些时间）'; $lang['submit'] = '发送数据'; diff --git a/lib/plugins/revert/lang/zh/lang.php b/lib/plugins/revert/lang/zh/lang.php index c3d1639ff..d4d010f29 100644 --- a/lib/plugins/revert/lang/zh/lang.php +++ b/lib/plugins/revert/lang/zh/lang.php @@ -14,6 +14,7 @@ * @author Hiphen Lee * @author caii, patent agent in China * @author lainme993@gmail.com + * @author Shuo-Ting Jian */ $lang['menu'] = '还原管理器'; $lang['filter'] = '搜索包含垃圾信息的页面'; diff --git a/lib/plugins/usermanager/lang/zh/lang.php b/lib/plugins/usermanager/lang/zh/lang.php index c1cb0c91a..e7a228229 100644 --- a/lib/plugins/usermanager/lang/zh/lang.php +++ b/lib/plugins/usermanager/lang/zh/lang.php @@ -13,6 +13,7 @@ * @author Hiphen Lee * @author caii, patent agent in China * @author lainme993@gmail.com + * @author Shuo-Ting Jian */ $lang['menu'] = '用户管理器'; $lang['noauth'] = '（用户认证不可用）'; -- cgit v1.2.3 From 1b9261dbc48f77eaf32a87372f39f9db1ba4636a Mon Sep 17 00:00:00 2001 From: Shuo Ting Jian Date: Sun, 27 Nov 2011 11:19:58 +0100 Subject: Traditional Chinese language update --- inc/lang/zh-tw/lang.php | 46 +++++++++++++++++++++++++++++++++- lib/plugins/config/lang/zh-tw/lang.php | 2 ++ lib/plugins/plugin/lang/zh-tw/lang.php | 2 +- 3 files changed, 48 insertions(+), 2 deletions(-) diff --git a/inc/lang/zh-tw/lang.php b/inc/lang/zh-tw/lang.php index a46869d6c..a144767f4 100644 --- a/inc/lang/zh-tw/lang.php +++ b/inc/lang/zh-tw/lang.php @@ -51,6 +51,8 @@ $lang['btn_recover'] = '復原草稿'; $lang['btn_draftdel'] = '捨棄草稿'; $lang['btn_revert'] = '復原'; $lang['btn_register'] = '註冊'; +$lang['btn_apply'] = '套用'; +$lang['btn_media'] = '多媒體管理器'; $lang['loggedinas'] = '登入為'; $lang['user'] = '帳號'; $lang['pass'] = '密碼'; @@ -95,7 +97,7 @@ $lang['txt_filename'] = '請輸入要存在維基內的檔案名稱 ( $lang['txt_overwrt'] = '是否要覆蓋原有檔案'; $lang['lockedby'] = '目前已被下列人員鎖定'; $lang['lockexpire'] = '預計解除鎖定於'; -$lang['js']['willexpire'] = '本頁的編輯鎖定將在一分鐘內到期。要避免發生衝突，請按「預覽」鍵重設鎖定計時。'; +$lang['js']['willexpire'] = '本頁的編輯鎖定將在一分鐘內到期。要避免發生衝突，請按「預覽」鍵重設鎖定計時。'; $lang['js']['notsavedyet'] = '未儲存的變更將會遺失，繼續嗎？'; $lang['js']['searchmedia'] = '搜尋檔案'; $lang['js']['keepopen'] = '選擇時保持視窗開啟'; @@ -126,6 +128,17 @@ $lang['js']['nosmblinks'] = '只有在 Microsoft IE 下才能執行「連 $lang['js']['linkwiz'] = '建立連結精靈'; $lang['js']['linkto'] = '連結至：'; $lang['js']['del_confirm'] = '確定刪除選取的項目？'; +$lang['js']['restore_confirm'] = '確定還原到這個版本？'; +$lang['js']['media_diff'] = '檢視差異:'; +$lang['js']['media_diff_both'] = '並排'; +$lang['js']['media_diff_opacity'] = '重疊'; +$lang['js']['media_diff_portions'] = '滑動'; +$lang['js']['media_select'] = '選擇檔案…'; +$lang['js']['media_upload_btn'] = '上傳'; +$lang['js']['media_done_btn'] = '完成'; +$lang['js']['media_drop'] = '拖拉檔案到此上傳'; +$lang['js']['media_cancel'] = '刪除'; +$lang['js']['media_overwrt'] = '覆蓋已存在的檔案'; $lang['rssfailed'] = '擷取 RSS 饋送檔時發生錯誤：'; $lang['nothingfound'] = '沒找到任何結果。'; $lang['mediaselect'] = '媒體檔案'; @@ -180,6 +193,10 @@ $lang['mail_changed'] = '變更的頁面:'; $lang['mail_subscribe_list'] = '命名空間中更動的頁面:'; $lang['mail_new_user'] = '新使用者:'; $lang['mail_upload'] = '已上傳檔案:'; +$lang['changes_type'] = '檢視最近更新類型'; +$lang['pages_changes'] = '頁面'; +$lang['media_changes'] = '多媒體檔案'; +$lang['both_changes'] = '頁面和多媒體檔案'; $lang['qb_bold'] = '粗體'; $lang['qb_italic'] = '斜體'; $lang['qb_underl'] = '底線'; @@ -220,6 +237,9 @@ $lang['img_copyr'] = '版權'; $lang['img_format'] = '格式'; $lang['img_camera'] = '相機'; $lang['img_keywords'] = '關鍵字'; +$lang['img_width'] = '寬度'; +$lang['img_height'] = '高度'; +$lang['img_manager'] = '在多媒體管理器中檢視'; $lang['subscr_subscribe_success'] = '已將 %s 加入至 %s 的訂閱列表'; $lang['subscr_subscribe_error'] = '將 %s 加入至 %s 的訂閱列表時發生錯誤'; $lang['subscr_subscribe_noaddress'] = '沒有與您登入相關的地址，無法將您加入訂閱列表'; @@ -286,3 +306,27 @@ $lang['hours'] = '%d 個小時前'; $lang['minutes'] = '%d 分鐘前'; $lang['seconds'] = '%s 秒鐘前'; $lang['wordblock'] = '您的更改沒有被儲存，因为它包含被阻擋的文字 (垃圾訊息)。'; +$lang['media_uploadtab'] = '上傳'; +$lang['media_searchtab'] = '搜尋'; +$lang['media_file'] = '檔案'; +$lang['media_viewtab'] = '檢視'; +$lang['media_edittab'] = '編輯'; +$lang['media_historytab'] = '歷史紀錄'; +$lang['media_list_thumbs'] = '縮圖'; +$lang['media_list_rows'] = '列表'; +$lang['media_sort_name'] = '名稱'; +$lang['media_sort_date'] = '日期'; +$lang['media_namespaces'] = '選擇命名空間'; +$lang['media_files'] = '在 %s 中的檔案'; +$lang['media_upload'] = '上傳至 %s'; +$lang['media_search'] = '在 %s 中搜尋'; +$lang['media_view'] = '%s'; +$lang['media_viewold'] = '%s 在 %s'; +$lang['media_edit'] = '編輯 %s'; +$lang['media_history'] = '%s 的歷史紀錄'; +$lang['media_meta_edited'] = '元資料已編輯'; +$lang['media_perm_read'] = '抱歉，您沒有足夠權限讀取檔案'; +$lang['media_perm_upload'] = '抱歉，您沒有足夠權限上傳檔案。'; +$lang['media_update'] = '上傳新的版本'; +$lang['media_restore'] = '還原這個版本'; +$lang['plugin_install_err'] = '插件安裝錯誤。將插件目錄 "%s" 重新命名為 "%s"'; diff --git a/lib/plugins/config/lang/zh-tw/lang.php b/lib/plugins/config/lang/zh-tw/lang.php index 29aeaec3b..4f44eb60d 100644 --- a/lib/plugins/config/lang/zh-tw/lang.php +++ b/lib/plugins/config/lang/zh-tw/lang.php @@ -44,6 +44,7 @@ $lang['lang'] = '語系'; $lang['basedir'] = '根目錄'; $lang['baseurl'] = '根路徑 (URL)'; $lang['savedir'] = '儲存資料的目錄'; +$lang['cookiedir'] = 'Cookie 路徑。設定空白則使用 baseurl。'; $lang['start'] = '開始頁面的名稱'; $lang['title'] = '維基標題'; $lang['template'] = '樣板'; @@ -114,6 +115,7 @@ $lang['jpg_quality'] = 'JPG 壓縮品質(0-100)'; $lang['subscribers'] = '啟用頁面訂閱'; $lang['subscribe_time'] = '訂閱列表和摘要發送的時間間隔 (秒)；這個值應該小於指定的最近更改保留時間 (recent_days)。'; $lang['compress'] = '壓縮 CSS 與 JavaScript 的輸出'; +$lang['cssdatauri'] = 'CSS 中所引用的圖片假如小於該數字大小(bytes)，將會被直接嵌入 CSS 中來減少 HTTP Request 的發送。此功能在 IE 7 及之下版本不支援。推薦使用 400 到 600 之間。設定為0 則停用。'; $lang['hidepages'] = '隱藏匹配的界面 (正規式)'; $lang['send404'] = '存取不存在的頁面時送出 "HTTP 404/Page Not Found"'; $lang['sitemap'] = '產生 Google 站台地圖 (天)'; diff --git a/lib/plugins/plugin/lang/zh-tw/lang.php b/lib/plugins/plugin/lang/zh-tw/lang.php index 3c4827000..54234212d 100644 --- a/lib/plugins/plugin/lang/zh-tw/lang.php +++ b/lib/plugins/plugin/lang/zh-tw/lang.php @@ -54,4 +54,4 @@ $lang['enabled'] = '插件 %s 已啟用。'; $lang['notenabled'] = '插件 %s 無法啟用，請檢查檔案權限。'; $lang['disabled'] = '插件 %s 已停用。'; $lang['notdisabled'] = '插件 %s 無法停用，請檢查檔案權限。'; -$lang['packageinstalled'] = '插件 (%d 插件: %s) 已成功地安裝。'; +$lang['packageinstalled'] = '插件 (%d 插件%s: %s) 已成功地安裝。'; -- cgit v1.2.3 From ad9bfc2d35566e0815820de21a664c6fb1c3c60a Mon Sep 17 00:00:00 2001 From: Christophe Martin Date: Sun, 27 Nov 2011 11:21:47 +0100 Subject: French language update --- inc/lang/fr/index.txt | 2 +- inc/lang/fr/lang.php | 18 ++++++++---------- lib/plugins/acl/lang/fr/help.txt | 4 ++-- lib/plugins/config/lang/fr/intro.txt | 2 +- lib/plugins/config/lang/fr/lang.php | 2 +- lib/plugins/plugin/lang/fr/admin_plugin.txt | 2 +- 6 files changed, 14 insertions(+), 16 deletions(-) diff --git a/inc/lang/fr/index.txt b/inc/lang/fr/index.txt index 14446681e..c66c656ab 100644 --- a/inc/lang/fr/index.txt +++ b/inc/lang/fr/index.txt @@ -1,4 +1,4 @@ ====== Index ====== -Voici un index de toutes les pages disponibles, triées par [[doku>namespaces|catégorie]]. +Voici un index de toutes les pages disponibles, triées par [[doku>fr:namespaces|catégorie]]. diff --git a/inc/lang/fr/lang.php b/inc/lang/fr/lang.php index 60b86b346..9399e1758 100644 --- a/inc/lang/fr/lang.php +++ b/inc/lang/fr/lang.php @@ -112,7 +112,7 @@ $lang['lockexpire'] = 'Le blocage expire à'; $lang['js']['willexpire'] = 'Votre verrouillage pour la modification de cette page expire dans une minute.\nPour éviter les conflits, utilisez le bouton « Aperçu » pour réinitialiser le minuteur.'; $lang['js']['notsavedyet'] = 'Les modifications non enregistrées seront perdues. Voulez-vous vraiment continuer ?'; $lang['js']['searchmedia'] = 'Chercher des fichiers'; -$lang['js']['keepopen'] = 'Gardez la fenêtre ouverte pendant la sélection'; +$lang['js']['keepopen'] = 'Gardez cette fenêtre toujours ouverte'; $lang['js']['hidedetails'] = 'Masquer détails'; $lang['js']['mediatitle'] = 'Paramètres de lien'; $lang['js']['mediadisplay'] = 'Type de lien'; @@ -135,12 +135,10 @@ $lang['js']['medialeft'] = 'Aligner l\'image sur la gauche.'; $lang['js']['mediaright'] = 'Aligner l\'image sur la droite.'; $lang['js']['mediacenter'] = 'Centrer l\'image'; $lang['js']['medianoalign'] = 'Ne pas aligner.'; -$lang['js']['nosmblinks'] = 'Les liens vers les partages Windows ne fonctionnent qu\'avec Microsoft Internet Explorer. - Vous pouvez toujours copier puis coller le lien.'; +$lang['js']['nosmblinks'] = 'Les liens vers les partages Windows ne fonctionnent qu\'avec Microsoft Internet Explorer.\nVous pouvez toujours copier puis coller le lien.'; $lang['js']['linkwiz'] = 'Assistant Lien'; $lang['js']['linkto'] = 'Lien vers :'; $lang['js']['del_confirm'] = 'Effacer cette entrée ?'; -$lang['js']['mu_btn'] = 'Envoyer plusieurs fichiers en même temps'; $lang['js']['restore_confirm'] = 'Voulez vous vraiment restaurer cette version ?'; $lang['js']['media_diff'] = 'Voir les différences:'; $lang['js']['media_diff_both'] = 'Côte à côte'; @@ -267,8 +265,8 @@ $lang['subscr_m_unsubscribe'] = 'Annuler la souscription'; $lang['subscr_m_subscribe'] = 'Souscrire'; $lang['subscr_m_receive'] = 'Recevoir'; $lang['subscr_style_every'] = 'Envoyer un courriel à chaque modification'; -$lang['subscr_style_digest'] = 'Courriel résumant les modifications de chaque page'; -$lang['subscr_style_list'] = 'Liste des pages modifiées depuis le dernier courriel'; +$lang['subscr_style_digest'] = 'Courriel, tous les %.2f jours, résumant les modifications de chaque page'; +$lang['subscr_style_list'] = 'Liste des pages modifiées depuis le dernier courriel (tous les %.2f jours)'; $lang['authmodfailed'] = 'Mauvais paramétrage de l\'authentification. Merci d\'informer l\'administrateur du Wiki.'; $lang['authtempfail'] = 'L\'authentification est temporairement indisponible. Si cela perdure, merci d\'informer l\'administrateur du Wiki.'; $lang['i_chooselang'] = 'Choisissez votre langue'; @@ -328,13 +326,13 @@ $lang['media_list_rows'] = 'Lignes'; $lang['media_sort_name'] = 'Tri par nom'; $lang['media_sort_date'] = 'Tri par date'; $lang['media_namespaces'] = 'Choisissez un espace de nom'; -$lang['media_files'] = 'Fichiers présents dans'; -$lang['media_upload'] = 'Télécharger dans la catégorie %s.'; -$lang['media_search'] = 'Chercher dans la catégorie %s.'; +$lang['media_files'] = 'Fichiers de %s'; +$lang['media_upload'] = 'Télécharger dans %s.'; +$lang['media_search'] = 'Chercher dans %s.'; $lang['media_view'] = '%s'; $lang['media_viewold'] = '%s dans %s'; $lang['media_edit'] = 'Éditer %s'; -$lang['media_history'] = 'Historique du %s'; +$lang['media_history'] = 'Historique de %s'; $lang['media_meta_edited'] = 'métadonnées éditées'; $lang['media_perm_read'] = 'Désolé, vous n\'avez pas les droits pour lire les fichiers.'; $lang['media_perm_upload'] = 'Désolé, vous n\'avez pas les droits pour télécharger des fichiers.'; diff --git a/lib/plugins/acl/lang/fr/help.txt b/lib/plugins/acl/lang/fr/help.txt index f748f6b23..158ec92ed 100644 --- a/lib/plugins/acl/lang/fr/help.txt +++ b/lib/plugins/acl/lang/fr/help.txt @@ -2,8 +2,8 @@ Cette page vous permet d'ajouter ou de supprimer des permissions pour les catégories et les pages de votre wiki. Le panneau de gauche liste toutes les catégories et les pages disponibles. -Le formulaire au-dessus permet d'afficher et de modifier les permissions d'un utilisateur ou d'un groupe sélectionné. +Le formulaire ci-dessus permet d'afficher et de modifier les permissions d'un utilisateur ou d'un groupe sélectionné. Dans le tableau ci-dessous, toutes les listes de contrôle d'accès actuelles sont affichées. Vous pouvez l'utiliser pour supprimer ou modifier rapidement plusieurs ACL. -La lecture de [[doku>acl|la documentation officielle des ACL]] pourra vous permettre de bien comprendre le fonctionnement du contrôle d'accès dans DokuWiki. +La lecture de [[doku>fr:acl|la documentation officielle des ACL]] pourra vous permettre de bien comprendre le fonctionnement du contrôle d'accès dans DokuWiki. diff --git a/lib/plugins/config/lang/fr/intro.txt b/lib/plugins/config/lang/fr/intro.txt index de8a965d8..2a59b34d1 100644 --- a/lib/plugins/config/lang/fr/intro.txt +++ b/lib/plugins/config/lang/fr/intro.txt @@ -1,6 +1,6 @@ ====== Gestionnaire de configuration ====== -Utilisez cette page pour contrôler les paramètres de votre installation de DokuWiki. Pour de l'aide sur chaque paramètre, reportez vous à [[doku>config]]. Pour d'autres détails concernant ce module, reportez vous à [[doku>plugin:config]]. +Utilisez cette page pour contrôler les paramètres de votre installation de DokuWiki. Pour de l'aide sur chaque paramètre, reportez vous à [[doku>fr:config]]. Pour d'autres détails concernant ce module, reportez vous à [[doku>fr:plugin:config]]. Les paramètres affichés sur un fond rouge sont protégés et ne peuvent être modifiés avec ce module. Les paramètres affichés sur un fond bleu sont les valeurs par défaut et les valeurs affectées à votre installation sont affichées sur un fond blanc. Les paramètres bleus et blancs peuvent être modifiés. diff --git a/lib/plugins/config/lang/fr/lang.php b/lib/plugins/config/lang/fr/lang.php index 8f669a629..9b4ecf286 100644 --- a/lib/plugins/config/lang/fr/lang.php +++ b/lib/plugins/config/lang/fr/lang.php @@ -62,7 +62,7 @@ $lang['youarehere'] = 'Traces hiérarchiques'; $lang['typography'] = 'Effectuer des améliorations typographiques'; $lang['htmlok'] = 'Permettre HTML dans les pages'; $lang['phpok'] = 'Permettre PHP dans les pages'; -$lang['dformat'] = 'Format de date (cf. fonction strftime de PHP)'; +$lang['dformat'] = 'Format de date (cf. fonction strftime de PHP)'; $lang['signature'] = 'Signature'; $lang['toptoclevel'] = 'Niveau le plus haut à afficher dans la table des matières'; $lang['tocminheads'] = 'Nombre minimum de titres pour qu\'une table des matières soit construite'; diff --git a/lib/plugins/plugin/lang/fr/admin_plugin.txt b/lib/plugins/plugin/lang/fr/admin_plugin.txt index c43e44684..f90b627f3 100644 --- a/lib/plugins/plugin/lang/fr/admin_plugin.txt +++ b/lib/plugins/plugin/lang/fr/admin_plugin.txt @@ -1,4 +1,4 @@ ====== Gestion des modules externes ====== -Cette page vous permet de gérer tout ce qui a trait aux [[doku>plugins|modules externes]] de DokuWiki. Pour télécharger et installer un module, le répertoire « ''plugin'' » doit être accessible en écriture pour le serveur Web. +Cette page vous permet de gérer tout ce qui a trait aux [[doku>fr:plugins|modules externes]] de DokuWiki. Pour télécharger et installer un module, le répertoire « ''plugin'' » doit être accessible en écriture pour le serveur Web. -- cgit v1.2.3 From 37c23632c35f0c77ba6e0f3ba98bfd53efa7ba0d Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Sun, 27 Nov 2011 11:37:26 +0100 Subject: added missing config metadata FS#2383 Translators need to add another string. --- conf/dokuwiki.php | 1 + lib/plugins/config/lang/en/lang.php | 1 + lib/plugins/config/settings/config.metadata.php | 1 + 3 files changed, 3 insertions(+) diff --git a/conf/dokuwiki.php b/conf/dokuwiki.php index 298c8e572..41f0fd566 100644 --- a/conf/dokuwiki.php +++ b/conf/dokuwiki.php @@ -18,6 +18,7 @@ $conf['dmode'] = 0755; //set directory creation mode $conf['lang'] = 'en'; //your language $conf['basedir'] = ''; //absolute dir from serveroot - blank for autodetection $conf['baseurl'] = ''; //URL to server including protocol - blank for autodetect +$conf['cookiedir'] = ''; //Cookie path. Leave blank for using baseurl. $conf['savedir'] = './data'; //where to store all the files $conf['allowdebug'] = 0; //allow debug output, enable if needed 0|1 $conf['mediarevisions'] = 1; //enable/disable media revisions diff --git a/lib/plugins/config/lang/en/lang.php b/lib/plugins/config/lang/en/lang.php index 380f2fd1d..a075d7cc2 100644 --- a/lib/plugins/config/lang/en/lang.php +++ b/lib/plugins/config/lang/en/lang.php @@ -82,6 +82,7 @@ $lang['useheading'] = 'Use first heading for pagenames'; $lang['refcheck'] = 'Media reference check'; $lang['refshow'] = 'Number of media references to show'; $lang['allowdebug'] = 'Allow debug disable if not needed!'; +$lang['mediarevisions'] = 'Enable Mediarevisions?'; $lang['usewordblock']= 'Block spam based on wordlist'; $lang['indexdelay'] = 'Time delay before indexing (sec)'; diff --git a/lib/plugins/config/settings/config.metadata.php b/lib/plugins/config/settings/config.metadata.php index 5f2c32ea7..d8ad06134 100644 --- a/lib/plugins/config/settings/config.metadata.php +++ b/lib/plugins/config/settings/config.metadata.php @@ -164,6 +164,7 @@ $meta['target____media'] = array('string'); $meta['target____windows'] = array('string'); $meta['_media'] = array('fieldset'); +$meta['mediarevisions'] = array('onoff'); $meta['gdlib'] = array('multichoice','_choices' => array(0,1,2)); $meta['im_convert'] = array('im_convert'); $meta['jpg_quality'] = array('numeric','_pattern' => '/^100$|^[1-9]?[0-9]$/'); //(0-100) -- cgit v1.2.3 From a09383eaa9211bb592151c29e7b85f027c05aaec Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Sun, 27 Nov 2011 11:43:37 +0100 Subject: avoid PHP notice in ACL ajax backend FS#2384 --- lib/plugins/acl/ajax.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/plugins/acl/ajax.php b/lib/plugins/acl/ajax.php index d704fa8c9..71a2eb03a 100644 --- a/lib/plugins/acl/ajax.php +++ b/lib/plugins/acl/ajax.php @@ -7,7 +7,7 @@ */ //fix for Opera XMLHttpRequests -if(!count($_POST) && $HTTP_RAW_POST_DATA){ +if(!count($_POST) && !empty($HTTP_RAW_POST_DATA)){ parse_str($HTTP_RAW_POST_DATA, $_POST); } -- cgit v1.2.3 From 9015e3112dbe9466391f385413840112b6d4da1c Mon Sep 17 00:00:00 2001 From: Marijn Hofstra Date: Sun, 27 Nov 2011 12:27:07 +0100 Subject: Dutch language update --- inc/lang/nl/lang.php | 9 +++++++++ lib/plugins/config/lang/nl/lang.php | 1 + lib/plugins/plugin/lang/nl/lang.php | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/inc/lang/nl/lang.php b/inc/lang/nl/lang.php index 62d23b0d2..35dce121e 100644 --- a/inc/lang/nl/lang.php +++ b/inc/lang/nl/lang.php @@ -138,8 +138,11 @@ $lang['js']['restore_confirm'] = 'Werkelijk deze versie terugzetten?'; $lang['js']['media_diff'] = 'Verschillen bekijken:'; $lang['js']['media_diff_both'] = 'Naast elkaar'; $lang['js']['media_diff_opacity'] = 'Doorschijnend'; +$lang['js']['media_diff_portions'] = 'Swipe'; $lang['js']['media_select'] = 'Selecteer bestanden'; +$lang['js']['media_upload_btn'] = 'Uploaden'; $lang['js']['media_done_btn'] = 'Klaar'; +$lang['js']['media_drop'] = 'Sleep bestanden hierheen om ze te uploaden'; $lang['js']['media_cancel'] = 'Verwijderen'; $lang['js']['media_overwrt'] = 'Bestaande bestanden overschrijven'; $lang['rssfailed'] = 'Er is een fout opgetreden bij het ophalen van de feed: '; @@ -196,6 +199,7 @@ $lang['mail_changed'] = 'pagina aangepast:'; $lang['mail_subscribe_list'] = 'Pagina\'s veranderd in namespace:'; $lang['mail_new_user'] = 'nieuwe gebruiker:'; $lang['mail_upload'] = 'bestand geüpload:'; +$lang['changes_type'] = 'Bekijk wijzigingen van'; $lang['pages_changes'] = 'Pagina\'s'; $lang['media_changes'] = 'Media bestanden'; $lang['both_changes'] = 'Zowel pagina\'s als media bestanden'; @@ -306,22 +310,27 @@ $lang['hours'] = '%d uren geleden'; $lang['minutes'] = '%d minuten geleden'; $lang['seconds'] = '%d seconden geleden'; $lang['wordblock'] = 'Uw wijziging is niet opgeslagen omdat deze niet-toegestane tekst bevat (spam).'; +$lang['media_uploadtab'] = 'Uploaden'; $lang['media_searchtab'] = 'Zoeken'; $lang['media_file'] = 'Bestand'; $lang['media_viewtab'] = 'Beeld'; $lang['media_edittab'] = 'Bewerken'; $lang['media_historytab'] = 'Geschiedenis'; +$lang['media_list_thumbs'] = 'Miniatuurweergaven'; $lang['media_list_rows'] = 'Regels'; $lang['media_sort_name'] = 'Naam'; $lang['media_sort_date'] = 'Datum'; $lang['media_namespaces'] = 'Kies naamruimte'; $lang['media_files'] = 'Bestanden in %s'; +$lang['media_upload'] = 'Upload naar %s'; $lang['media_search'] = 'Zoeken in %s'; $lang['media_view'] = '%s'; +$lang['media_viewold'] = '%s bij %s'; $lang['media_edit'] = '%s bewerken'; $lang['media_history'] = 'Geschiedenis van %s'; $lang['media_meta_edited'] = 'Metagegevens bewerkt'; $lang['media_perm_read'] = 'Sorry, u heeft niet voldoende rechten om bestanden te lezen.'; $lang['media_perm_upload'] = 'Sorry, u heeft niet voldoende rechten om bestanden te uploaden.'; +$lang['media_update'] = 'Upload nieuwe versie'; $lang['media_restore'] = 'Deze versie terugzetten'; $lang['plugin_install_err'] = 'Plugin is juist geinstalleerd. Hernoem plugin map \'%s\' naar \'%s\'.'; diff --git a/lib/plugins/config/lang/nl/lang.php b/lib/plugins/config/lang/nl/lang.php index f6574ee2c..65385cc43 100644 --- a/lib/plugins/config/lang/nl/lang.php +++ b/lib/plugins/config/lang/nl/lang.php @@ -119,6 +119,7 @@ $lang['jpg_quality'] = 'JPG compressiekwaliteit (0-100)'; $lang['subscribers'] = 'Ondersteuning pagina-inschrijving aanzetten'; $lang['subscribe_time'] = 'Inschrijvingsmeldingen en samenvattingen worden na deze tijdsduur (in seconden) verzonden. Deze waarde dient kleiner te zijn dan de tijd ingevuld bij "Hoeveel recente wijzigingen bewaren (dagen)"'; $lang['compress'] = 'Compacte CSS en javascript output'; +$lang['cssdatauri'] = 'Maximale omvang in bytes van in CSS gelinkte afbeeldingen die bij de stylesheet moeten worden ingesloten ter reductie van de HTTP request header overhead. Deze techniek werkt niet in IE7 en ouder! 400 tot 600 is een geschikte omvang. Stel de omvang in op 0 om deze functionaliteit uit te schakelen.'; $lang['hidepages'] = 'Verberg deze pagina\'s (regular expressions)'; $lang['send404'] = 'Stuur "HTTP 404/Page Not Found" voor niet-bestaande pagina\'s'; $lang['sitemap'] = 'Genereer Google sitemap (dagen)'; diff --git a/lib/plugins/plugin/lang/nl/lang.php b/lib/plugins/plugin/lang/nl/lang.php index 18662e15b..d13e46ff8 100644 --- a/lib/plugins/plugin/lang/nl/lang.php +++ b/lib/plugins/plugin/lang/nl/lang.php @@ -57,4 +57,4 @@ $lang['enabled'] = 'Plugin %s ingeschakeld.'; $lang['notenabled'] = 'Plugin %s kon niet worden ingeschakeld, controleer bestandsrechten.'; $lang['disabled'] = 'Plugin %s uitgeschakeld.'; $lang['notdisabled'] = 'Plugin %s kon niet worden uitgeschakeld, controleer bestandsrechten.'; -$lang['packageinstalled'] = 'Plugin package (%d plugin(s): %s) succesvol geïnstalleerd.'; +$lang['packageinstalled'] = 'Plugin package (%d plugin%s: %s) succesvol geïnstalleerd.'; -- cgit v1.2.3 From 90565d653f88b4e3c641a01616f6a10cbf54d0ad Mon Sep 17 00:00:00 2001 From: Aivars Miska Date: Sun, 27 Nov 2011 12:28:27 +0100 Subject: Latvian language update --- inc/lang/lv/lang.php | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/inc/lang/lv/lang.php b/inc/lang/lv/lang.php index 926341393..37a0bf6a9 100644 --- a/inc/lang/lv/lang.php +++ b/inc/lang/lv/lang.php @@ -123,7 +123,6 @@ Protams, ka vari saiti kopēt un iespraust citā programmā.'; $lang['js']['linkwiz'] = 'Saišu vednis'; $lang['js']['linkto'] = 'Saite uz: '; $lang['js']['del_confirm'] = 'Dzēst šo šķirkli?'; -$lang['js']['mu_btn'] = 'Augšuplādēt uzreiz vairākus failus.'; $lang['js']['restore_confirm'] = 'Tiešām atjaunot šo versiju'; $lang['js']['media_diff'] = 'Skatīt atšķirību'; $lang['js']['media_diff_both'] = 'Blakus'; @@ -248,9 +247,9 @@ $lang['subscr_m_unsubscribe'] = 'Atteikties no abonēšanas'; $lang['subscr_m_subscribe'] = 'Abonēt'; $lang['subscr_m_receive'] = 'Saņemt'; $lang['subscr_style_every'] = 'vēstuli par katru izmaiņu'; -$lang['subscr_style_digest'] = 'kopsavilkumu par katru lapu'; -$lang['subscr_style_list'] = 'kopš pēdējās vēstules notikušo labojumu sarakstu'; -$lang['authmodfailed'] = 'Aplami konfigurēta lietotāju autentifikācija. Lūdzo ziņo Wiki administratoram.'; +$lang['subscr_style_digest'] = 'kopsavilkumu par katru lapu (reizi %.2f dienās)'; +$lang['subscr_style_list'] = 'kopš pēdējās vēstules notikušo labojumu sarakstu (reizi %.2f dienās)'; +$lang['authmodfailed'] = 'Aplami konfigurēta lietotāju autentifikācija. Lūdzu ziņo Wiki administratoram.'; $lang['authtempfail'] = 'Lietotāju autentifikācija pašlaik nedarbojas. Ja tas turpinās ilgstoši, lūduz ziņo Wiki administratoram.'; $lang['i_chooselang'] = 'Izvēlies valodu'; $lang['i_installer'] = 'DokuWiki instalētājs'; @@ -294,7 +293,7 @@ $lang['recent_global'] = 'Tu skati izmaiņas nodaļā %s. Ir iesp $lang['years'] = 'pirms %d gadiem'; $lang['months'] = 'pirms %d mēnešiem'; $lang['weeks'] = 'pirms %d nedēļām'; -$lang['days'] = 'pirms %d dienām'; +$lang['days'] = 'pirms %d dienām'; $lang['hours'] = 'pirms %d stundām'; $lang['minutes'] = 'pirms %d minūtēm'; $lang['seconds'] = 'pirms %d sekundēm'; -- cgit v1.2.3 From 9df43a68bac022beef078c9d02df6364edea8596 Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Sun, 27 Nov 2011 14:46:05 +0100 Subject: use throbber in ACL ajax interface To avoid problems when an AJAX request takes a bit longer in the ACL manager, a throbber is shown while loading the info. --- lib/plugins/acl/script.js | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/lib/plugins/acl/script.js b/lib/plugins/acl/script.js index d912a2407..0ba91cdc9 100644 --- a/lib/plugins/acl/script.js +++ b/lib/plugins/acl/script.js @@ -60,10 +60,12 @@ var dw_acl = { * Load the current permission info and edit form */ loadinfo: function () { - jQuery('#acl__info').load( - DOKU_BASE + 'lib/plugins/acl/ajax.php', - jQuery('#acl__detail form').serialize() + '&ajax=info' - ); + jQuery('#acl__info') + .html('...') + .load( + DOKU_BASE + 'lib/plugins/acl/ajax.php', + jQuery('#acl__detail form').serialize() + '&ajax=info' + ); return false; }, -- cgit v1.2.3 From 8d739053e2e2092fa7136a1709c730407f770143 Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Sun, 27 Nov 2011 16:32:35 +0100 Subject: fix IE8 error FS#2381 A trailing comma created an empty array item causing IE8 to choke. --- lib/scripts/editor.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/scripts/editor.js b/lib/scripts/editor.js index 2009ce6af..f36d446d5 100644 --- a/lib/scripts/editor.js +++ b/lib/scripts/editor.js @@ -61,9 +61,9 @@ var dw_editor = { jQuery.each([ ['larger', function(){dw_editor.sizeCtl(editor,100);}], ['smaller', function(){dw_editor.sizeCtl(editor,-100);}], - ['wrap', function(){dw_editor.toggleWrap(editor);}], + ['wrap', function(){dw_editor.toggleWrap(editor);}] ], function (_, img) { - jQuery(document.createElement('img')) + jQuery(document.createElement('IMG')) .attr('src', DOKU_BASE+'lib/images/' + img[0] + '.gif') .click(img[1]) .appendTo($ctl); -- cgit v1.2.3 From 29a277ba918a65400b1beb961d142772efc26897 Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Sun, 27 Nov 2011 16:42:29 +0100 Subject: IE doesn't know indexOf for arrays FS#2381 this fixes another IE javascript problem in edit mode --- lib/scripts/editor.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/scripts/editor.js b/lib/scripts/editor.js index f36d446d5..042e34608 100644 --- a/lib/scripts/editor.js +++ b/lib/scripts/editor.js @@ -130,7 +130,7 @@ var dw_editor = { * @param event e - the key press event object */ keyHandler: function(e){ - if([8, 13, 32].indexOf(e.keyCode) === -1) { + if(jQuery.inArray(e.keyCode,[8, 13, 32]) === -1) { return; } var selection = getSelection(this); -- cgit v1.2.3 From 2e9c51889d8855cf56cb3f21a9c4926bd94ef21f Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Sun, 27 Nov 2011 16:52:41 +0100 Subject: IE8: fix namespace selection in link wizard FS#2391 IE8 can't substr() with negative offsets. --- lib/scripts/linkwiz.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/scripts/linkwiz.js b/lib/scripts/linkwiz.js index cc4c19e0d..ce072d4b2 100644 --- a/lib/scripts/linkwiz.js +++ b/lib/scripts/linkwiz.js @@ -186,7 +186,7 @@ var dw_linkwiz = { */ resultClick: function(a){ dw_linkwiz.$entry.val(a.title); - if(a.title == '' || a.title.substr(-1) == ':'){ + if(a.title == '' || a.title.substr(a.title.length-1) == ':'){ dw_linkwiz.autocomplete_exec(); }else{ if (jQuery(a.nextSibling).is('span')) { -- cgit v1.2.3 From 2fe6daea539c94704c1932f546ad01d3bfc5d04c Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Sun, 27 Nov 2011 16:59:14 +0100 Subject: suppress errors on stream_select FS#2276 On certain environments, stream_select might produce temporary errors when file descriptors are running scarce. --- inc/HTTPClient.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/inc/HTTPClient.php b/inc/HTTPClient.php index fdf95d113..641950348 100644 --- a/inc/HTTPClient.php +++ b/inc/HTTPClient.php @@ -338,7 +338,10 @@ class HTTPClient { } // wait for stream ready or timeout (1sec) - if(stream_select($sel_r,$sel_w,$sel_e,1) === false) continue; + if(@stream_select($sel_r,$sel_w,$sel_e,1) === false){ + usleep(1000); + continue; + } // write to stream $ret = fwrite($socket, substr($request,$written,4096)); -- cgit v1.2.3 From c798b23bcedefa974e4af474904e4e24cdad67d5 Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Sun, 27 Nov 2011 17:33:52 +0100 Subject: rely on jQuery UI's dialog methods for toggling the linkwizard FS#2394 --- lib/scripts/linkwiz.js | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/lib/scripts/linkwiz.js b/lib/scripts/linkwiz.js index ce072d4b2..dcfafd75e 100644 --- a/lib/scripts/linkwiz.js +++ b/lib/scripts/linkwiz.js @@ -35,13 +35,12 @@ var dw_linkwiz = { ) .parent() .attr('id','link__wiz') - .addClass('a11y') .css({ 'position': 'absolute', 'top': (pos.top+20)+'px', 'left': (pos.left+80)+'px' }) - .show() + .hide() .appendTo('div.dokuwiki'); dw_linkwiz.textArea = $editor[0]; @@ -283,7 +282,7 @@ var dw_linkwiz = { */ show: function(){ dw_linkwiz.selection = getSelection(dw_linkwiz.textArea); - dw_linkwiz.$wiz.removeClass('a11y'); + dw_linkwiz.$wiz.show(); dw_linkwiz.$entry.focus(); dw_linkwiz.autocomplete(); }, @@ -292,7 +291,7 @@ var dw_linkwiz = { * Hide the link wizard */ hide: function(){ - dw_linkwiz.$wiz.addClass('a11y'); + dw_linkwiz.$wiz.hide(); dw_linkwiz.textArea.focus(); }, @@ -300,7 +299,7 @@ var dw_linkwiz = { * Toggle the link wizard */ toggle: function(){ - if(dw_linkwiz.$wiz.hasClass('a11y')){ + if(dw_linkwiz.$wiz.css('display') == 'none'){ dw_linkwiz.show(); }else{ dw_linkwiz.hide(); -- cgit v1.2.3 From 28db35ad3dd974cc2f627d25f7bcc16e9fd0ceac Mon Sep 17 00:00:00 2001 From: dploeger Date: Mon, 28 Nov 2011 11:43:41 +0100 Subject: Fixes SYMPTOMS of FS #2393 --- inc/media.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/inc/media.php b/inc/media.php index 9d3e90a54..db975380f 100644 --- a/inc/media.php +++ b/inc/media.php @@ -108,7 +108,7 @@ function media_metaform($id,$auth){ $src = mediaFN($id); // output - $form = new Doku_Form(array('action' => media_managerURL(array('tab_details' => 'view')), + $form = new Doku_Form(array('action' => media_managerURL(array('tab_details' => 'view'), '&'), 'class' => 'meta')); $form->addHidden('img', $id); $form->addHidden('mediado', 'save'); -- cgit v1.2.3 From 2d2d9d0f3a410b31d76a2be193fe16b3dbd79096 Mon Sep 17 00:00:00 2001 From: Dominik Eckelmann Date: Mon, 28 Nov 2011 19:09:48 +0100 Subject: collect remote functions in a class --- inc/RemoteAPICore.php | 617 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 617 insertions(+) create mode 100644 inc/RemoteAPICore.php diff --git a/inc/RemoteAPICore.php b/inc/RemoteAPICore.php new file mode 100644 index 000000000..c4324ba29 --- /dev/null +++ b/inc/RemoteAPICore.php @@ -0,0 +1,617 @@ + + * @param string $id file id + * @return media file + */ + function getAttachment($id){ + $id = cleanID($id); + if (auth_quickaclcheck(getNS($id).':*') < AUTH_READ) { + throw new RemoteAccessDenied(); + } + + $file = mediaFN($id); + if (!@ file_exists($file)) { + throw new RemoteException('The requested file does not exist'); + } + + $data = io_readFile($file, false); + $base64 = base64_encode($data); + return $base64; + } + + /** + * Return info about a media file + * + * @author Gina Haeussge + */ + function getAttachmentInfo($id){ + $id = cleanID($id); + $info = array( + 'lastModified' => 0, + 'size' => 0, + ); + + $file = mediaFN($id); + if ((auth_quickaclcheck(getNS($id).':*') >= AUTH_READ) && file_exists($file)){ + $info['lastModified'] = new IXR_Date(filemtime($file)); + $info['size'] = filesize($file); + } + + return $info; + } + + /** + * Return a wiki page rendered to html + */ + function htmlPage($id,$rev=''){ + $id = cleanID($id); + if(auth_quickaclcheck($id) < AUTH_READ){ + throw new RemoteAccessDenied(1, 'You are not allowed to read this page'); + } + return p_wiki_xhtml($id,$rev,false); + } + + /** + * List all pages - we use the indexer list here + */ + function listPages(){ + $list = array(); + $pages = idx_get_indexer()->getPages(); + $pages = array_filter(array_filter($pages,'isVisiblePage'),'page_exists'); + + foreach(array_keys($pages) as $idx) { + $perm = auth_quickaclcheck($pages[$idx]); + if($perm < AUTH_READ) { + continue; + } + $page = array(); + $page['id'] = trim($pages[$idx]); + $page['perms'] = $perm; + $page['size'] = @filesize(wikiFN($pages[$idx])); + $page['lastModified'] = new IXR_Date(@filemtime(wikiFN($pages[$idx]))); + $list[] = $page; + } + + return $list; + } + + /** + * List all pages in the given namespace (and below) + */ + function readNamespace($ns,$opts){ + global $conf; + + if(!is_array($opts)) $opts=array(); + + $ns = cleanID($ns); + $dir = utf8_encodeFN(str_replace(':', '/', $ns)); + $data = array(); + $opts['skipacl'] = 0; // no ACL skipping for XMLRPC + search($data, $conf['datadir'], 'search_allpages', $opts, $dir); + return $data; + } + + /** + * List all pages in the given namespace (and below) + */ + function search($query){ + require_once(DOKU_INC.'inc/fulltext.php'); + + $regex = ''; + $data = ft_pageSearch($query,$regex); + $pages = array(); + + // prepare additional data + $idx = 0; + foreach($data as $id => $score){ + $file = wikiFN($id); + + if($idx < FT_SNIPPET_NUMBER){ + $snippet = ft_snippet($id,$regex); + $idx++; + }else{ + $snippet = ''; + } + + $pages[] = array( + 'id' => $id, + 'score' => $score, + 'rev' => filemtime($file), + 'mtime' => filemtime($file), + 'size' => filesize($file), + 'snippet' => $snippet, + ); + } + return $pages; + } + + /** + * Returns the wiki title. + */ + function getTitle(){ + global $conf; + return $conf['title']; + } + + /** + * List all media files. + * + * Available options are 'recursive' for also including the subnamespaces + * in the listing, and 'pattern' for filtering the returned files against + * a regular expression matching their name. + * + * @author Gina Haeussge + */ + function listAttachments($ns, $options = array()) { + global $conf; + global $lang; + + $ns = cleanID($ns); + + if (!is_array($options)) $options = array(); + $options['skipacl'] = 0; // no ACL skipping for XMLRPC + + + if(auth_quickaclcheck($ns.':*') >= AUTH_READ) { + $dir = utf8_encodeFN(str_replace(':', '/', $ns)); + + $data = array(); + search($data, $conf['mediadir'], 'search_media', $options, $dir); + $len = count($data); + if(!$len) return array(); + + for($i=0; $i<$len; $i++) { + unset($data[$i]['meta']); + $data[$i]['lastModified'] = new IXR_Date($data[$i]['mtime']); + } + return $data; + } else { + throw new RemoteAccessDenied(1, 'You are not allowed to list media files.'); + } + } + + /** + * Return a list of backlinks + */ + function listBackLinks($id){ + return ft_backlinks(cleanID($id)); + } + + /** + * Return some basic data about a page + */ + function pageInfo($id,$rev=''){ + $id = cleanID($id); + if(auth_quickaclcheck($id) < AUTH_READ){ + throw new RemoteAccessDenied(1, 'You are not allowed to read this page'); + } + $file = wikiFN($id,$rev); + $time = @filemtime($file); + if(!$time){ + throw new RemoteException(10, 'The requested page does not exist'); + } + + $info = getRevisionInfo($id, $time, 1024); + + $data = array( + 'name' => $id, + 'lastModified' => new IXR_Date($time), + 'author' => (($info['user']) ? $info['user'] : $info['ip']), + 'version' => $time + ); + + return ($data); + } + + /** + * Save a wiki page + * + * @author Michael Klier + */ + function putPage($id, $text, $params) { + global $TEXT; + global $lang; + global $conf; + + $id = cleanID($id); + $TEXT = cleanText($text); + $sum = $params['sum']; + $minor = $params['minor']; + + if(empty($id)) { + throw new RemoteException(1, 'Empty page ID'); + } + + if(!page_exists($id) && trim($TEXT) == '' ) { + throw new RemoteException(1, 'Refusing to write an empty new wiki page'); + } + + if(auth_quickaclcheck($id) < AUTH_EDIT) { + throw new RemoteAccessDenied(1, 'You are not allowed to edit this page'); + } + + // Check, if page is locked + if(checklock($id)) { + throw new RemoteException(1, 'The page is currently locked'); + } + + // SPAM check + if(checkwordblock()) { + throw new RemoteException(1, 'Positive wordblock check'); + } + + // autoset summary on new pages + if(!page_exists($id) && empty($sum)) { + $sum = $lang['created']; + } + + // autoset summary on deleted pages + if(page_exists($id) && empty($TEXT) && empty($sum)) { + $sum = $lang['deleted']; + } + + lock($id); + + saveWikiText($id,$TEXT,$sum,$minor); + + unlock($id); + + // run the indexer if page wasn't indexed yet + idx_addPage($id); + + return 0; + } + + /** + * Appends text to a wiki page. + */ + function appendPage($id, $text, $params) { + $currentpage = $this->rawPage($id); + if (!is_string($currentpage)) { + return $currentpage; + } + return $this->putPage($id, $currentpage.$text, $params); + } + + /** + * Uploads a file to the wiki. + * + * Michael Klier + */ + function putAttachment($id, $file, $params) { + $id = cleanID($id); + $auth = auth_quickaclcheck(getNS($id).':*'); + + if(!isset($id)) { + throw new RemoteException(1, 'Filename not given.'); + } + + global $conf; + + $ftmp = $conf['tmpdir'] . '/' . md5($id.clientIP()); + + // save temporary file + @unlink($ftmp); + if (preg_match('/^[A-Za-z0-9\+\/]*={0,2}$/', $file) === 1) { + // DEPRECATED: Double-decode file if it still looks like base64 + // after first decoding (which is done by the library) + $file = base64_decode($file); + } + io_saveFile($ftmp, $file); + + $res = media_save(array('name' => $ftmp), $id, $params['ow'], $auth, 'rename'); + if (is_array($res)) { + throw new RemoteException(-$res[1], $res[0]); + } else { + return $res; + } + } + + /** + * Deletes a file from the wiki. + * + * @author Gina Haeussge + */ + function deleteAttachment($id){ + $id = cleanID($id); + $auth = auth_quickaclcheck(getNS($id).':*'); + $res = media_delete($id, $auth); + if ($res & DOKU_MEDIA_DELETED) { + return 0; + } elseif ($res & DOKU_MEDIA_NOT_AUTH) { + throw new RemoteAccessDenied(1, "You don't have permissions to delete files."); + } elseif ($res & DOKU_MEDIA_INUSE) { + throw new RemoteException(1, 'File is still referenced'); + } else { + throw new RemoteException(1, 'Could not delete file'); + } + } + + /** + * Returns the permissions of a given wiki page + */ + function aclCheck($id) { + $id = cleanID($id); + return auth_quickaclcheck($id); + } + + /** + * Lists all links contained in a wiki page + * + * @author Michael Klier + */ + function listLinks($id) { + $id = cleanID($id); + if(auth_quickaclcheck($id) < AUTH_READ){ + throw new RemoteAccessDenied(1, 'You are not allowed to read this page'); + } + $links = array(); + + // resolve page instructions + $ins = p_cached_instructions(wikiFN($id)); + + // instantiate new Renderer - needed for interwiki links + include(DOKU_INC.'inc/parser/xhtml.php'); + $Renderer = new Doku_Renderer_xhtml(); + $Renderer->interwiki = getInterwiki(); + + // parse parse instructions + foreach($ins as $in) { + $link = array(); + switch($in[0]) { + case 'internallink': + $link['type'] = 'local'; + $link['page'] = $in[1][0]; + $link['href'] = wl($in[1][0]); + array_push($links,$link); + break; + case 'externallink': + $link['type'] = 'extern'; + $link['page'] = $in[1][0]; + $link['href'] = $in[1][0]; + array_push($links,$link); + break; + case 'interwikilink': + $url = $Renderer->_resolveInterWiki($in[1][2],$in[1][3]); + $link['type'] = 'extern'; + $link['page'] = $url; + $link['href'] = $url; + array_push($links,$link); + break; + } + } + + return ($links); + } + + /** + * Returns a list of recent changes since give timestamp + * + * @author Michael Hamann + * @author Michael Klier + */ + function getRecentChanges($timestamp) { + if(strlen($timestamp) != 10) { + throw new RemoteException(20, 'The provided value is not a valid timestamp'); + } + + $recents = getRecentsSince($timestamp); + + $changes = array(); + + foreach ($recents as $recent) { + $change = array(); + $change['name'] = $recent['id']; + $change['lastModified'] = new IXR_Date($recent['date']); + $change['author'] = $recent['user']; + $change['version'] = $recent['date']; + $change['perms'] = $recent['perms']; + $change['size'] = @filesize(wikiFN($recent['id'])); + array_push($changes, $change); + } + + if (!empty($changes)) { + return $changes; + } else { + // in case we still have nothing at this point + return new RemoteException('There are no changes in the specified timeframe'); + } + } + + /** + * Returns a list of recent media changes since give timestamp + * + * @author Michael Hamann + * @author Michael Klier + */ + function getRecentMediaChanges($timestamp) { + if(strlen($timestamp) != 10) + throw new RemoteException(20, 'The provided value is not a valid timestamp'); + + $recents = getRecentsSince($timestamp, null, '', RECENTS_MEDIA_CHANGES); + + $changes = array(); + + foreach ($recents as $recent) { + $change = array(); + $change['name'] = $recent['id']; + $change['lastModified'] = new IXR_Date($recent['date']); + $change['author'] = $recent['user']; + $change['version'] = $recent['date']; + $change['perms'] = $recent['perms']; + $change['size'] = @filesize(mediaFN($recent['id'])); + array_push($changes, $change); + } + + if (!empty($changes)) { + return $changes; + } else { + // in case we still have nothing at this point + throw new RemoteException(30, 'There are no changes in the specified timeframe'); + } + } + + /** + * Returns a list of available revisions of a given wiki page + * + * @author Michael Klier + */ + function pageVersions($id, $first) { + $id = cleanID($id); + if(auth_quickaclcheck($id) < AUTH_READ) { + throw new RemoteAccessDenied(1, 'You are not allowed to read this page'); + } + global $conf; + + $versions = array(); + + if(empty($id)) { + throw new RemoteException(1, 'Empty page ID'); + } + + $revisions = getRevisions($id, $first, $conf['recent']+1); + + if(count($revisions)==0 && $first!=0) { + $first=0; + $revisions = getRevisions($id, $first, $conf['recent']+1); + } + + if(count($revisions)>0 && $first==0) { + array_unshift($revisions, ''); // include current revision + array_pop($revisions); // remove extra log entry + } + + if(count($revisions) > $conf['recent']) { + array_pop($revisions); // remove extra log entry + } + + if(!empty($revisions)) { + foreach($revisions as $rev) { + $file = wikiFN($id,$rev); + $time = @filemtime($file); + // we check if the page actually exists, if this is not the + // case this can lead to less pages being returned than + // specified via $conf['recent'] + if($time){ + $info = getRevisionInfo($id, $time, 1024); + if(!empty($info)) { + $data['user'] = $info['user']; + $data['ip'] = $info['ip']; + $data['type'] = $info['type']; + $data['sum'] = $info['sum']; + $data['modified'] = new IXR_Date($info['date']); + $data['version'] = $info['date']; + array_push($versions, $data); + } + } + } + return $versions; + } else { + return array(); + } + } + + /** + * The version of Wiki RPC API supported + */ + function wiki_RPCVersion(){ + return 2; + } + + + /** + * Locks or unlocks a given batch of pages + * + * Give an associative array with two keys: lock and unlock. Both should contain a + * list of pages to lock or unlock + * + * Returns an associative array with the keys locked, lockfail, unlocked and + * unlockfail, each containing lists of pages. + */ + function setLocks($set){ + $locked = array(); + $lockfail = array(); + $unlocked = array(); + $unlockfail = array(); + + foreach((array) $set['lock'] as $id){ + $id = cleanID($id); + if(auth_quickaclcheck($id) < AUTH_EDIT || checklock($id)){ + $lockfail[] = $id; + }else{ + lock($id); + $locked[] = $id; + } + } + + foreach((array) $set['unlock'] as $id){ + $id = cleanID($id); + if(auth_quickaclcheck($id) < AUTH_EDIT || !unlock($id)){ + $unlockfail[] = $id; + }else{ + $unlocked[] = $id; + } + } + + return array( + 'locked' => $locked, + 'lockfail' => $lockfail, + 'unlocked' => $unlocked, + 'unlockfail' => $unlockfail, + ); + } + + function getAPIVersion(){ + return DOKU_XMLRPC_API_VERSION; + } + + function login($user,$pass){ + global $conf; + global $auth; + if(!$conf['useacl']) return 0; + if(!$auth) return 0; + + @session_start(); // reopen session for login + if($auth->canDo('external')){ + $ok = $auth->trustExternal($user,$pass,false); + }else{ + $evdata = array( + 'user' => $user, + 'password' => $pass, + 'sticky' => false, + 'silent' => true, + ); + $ok = trigger_event('AUTH_LOGIN_CHECK', $evdata, 'auth_login_wrapper'); + } + session_write_close(); // we're done with the session + + return $ok; + } + + +} \ No newline at end of file -- cgit v1.2.3 From f61380cb67f8216ae4c75922511ff5a07fd21ca0 Mon Sep 17 00:00:00 2001 From: Dominik Eckelmann Date: Mon, 28 Nov 2011 19:06:16 +0100 Subject: introduced first remote test cases --- _test/cases/inc/remote.test.php | 77 +++++++++++++++++++++++++++++++++++++++++ inc/remote.php | 2 +- 2 files changed, 78 insertions(+), 1 deletion(-) create mode 100644 _test/cases/inc/remote.test.php diff --git a/_test/cases/inc/remote.test.php b/_test/cases/inc/remote.test.php new file mode 100644 index 000000000..aa7a8cd1b --- /dev/null +++ b/_test/cases/inc/remote.test.php @@ -0,0 +1,77 @@ + array( + 'args' => array(), + 'return' => 'void' + ), + 'method2' => array( + 'args' => array('string', 'int', 'bool'), + 'return' => array('string'), + ) + ); + } +} + + +class remote_test extends UnitTestCase { + + var $originalConf; + + var $remote; + + function setUp() { + global $plugin_controller; + global $conf; + parent::setUp(); + $pluginManager = new MockDoku_Plugin_Controller(); + $pluginManager->setReturnValue('getList', array('testplugin')); + $pluginManager->setReturnValue('load', new remote_plugin_testplugin()); + $plugin_controller = $pluginManager; + + $this->originalConf = $conf; + + $this->remote = new RemoteAPI(); + } + + function tearDown() { + global $conf; + $conf = $this->originalConf; + } + + function test_pluginMethods() { + $methods = $this->remote->getPluginMethods(); + $this->assertEqual(array_keys($methods), array('plugin.testplugin.method1', 'plugin.testplugin.method2')); + } + + function test_hasAccessSuccess() { + global $conf; + $conf['remote'] = 1; + $this->assertTrue($this->remote->hasAccess()); + } + + function test_hasAccessFail() { + global $conf; + $conf['remote'] = 0; + $this->assertFalse($this->remote->hasAccess()); + } + + function test_forceAccessSuccess() { + global $conf; + $conf['remote'] = 1; + $this->remote->forceAccess(); // no exception should occur + } + + function test_forceAccessFail() { + global $conf; + $conf['remote'] = 0; + $this->expectException('RemoteException'); + $this->remote->forceAccess(); + } +} diff --git a/inc/remote.php b/inc/remote.php index 13a38aa17..6f48d2015 100644 --- a/inc/remote.php +++ b/inc/remote.php @@ -92,7 +92,7 @@ class RemoteAPI { * @throws RemoteException On denied access. * @return void */ - private function forceAccess() { + public function forceAccess() { if (!$this->hasAccess()) { throw new RemoteException('Access denied'); } -- cgit v1.2.3 From 4feb08e1dd7fd1c0a09310ca29a7cbac2559edb9 Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Mon, 28 Nov 2011 19:53:35 +0100 Subject: only strip special chars when suggesting an upload name FS#2377 The uploader now just strips a bunch of common special chars. This is not a complete cleanID() implementation. A full clean is done server-side on uploading. --- lib/scripts/fileuploaderextended.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/scripts/fileuploaderextended.js b/lib/scripts/fileuploaderextended.js index f92bdbc49..4abd63bef 100644 --- a/lib/scripts/fileuploaderextended.js +++ b/lib/scripts/fileuploaderextended.js @@ -55,9 +55,11 @@ qq.extend(qq.FileUploader.prototype, { qq.setText(fileElement, fileName); this._find(item, 'size').style.display = 'none'; + // name suggestion (simplified cleanID) var nameElement = this._find(item, 'nameInput'); fileName = fileName.toLowerCase(); - fileName = fileName.replace(/([^a-z0-9_\.\-]+)/g, '_'); + fileName = fileName.replace(/([ !"#$%&\'()+,\/;<=>?@[\]^`{|}~:]+)/g, '_'); + fileName = fileName.replace(/^_+/,''); nameElement.value = fileName; nameElement.id = 'mediamanager__upload_item'+id; -- cgit v1.2.3 From 3543c6de939c52517f590300b6d4289dc3a785ff Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Mon, 28 Nov 2011 20:29:39 +0100 Subject: deprecated 3rd parameter of cleanID() FS#2377 For some reason trailing/leading underscores were allowed when uploading files. But the rest of the code (eg. listing or downloading files) never supported this. This patch removes this special case for uploading files to streamline ID cleaning of pages and media files. --- inc/media.php | 2 +- inc/pageutils.php | 4 ++-- lib/exe/ajax.php | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/inc/media.php b/inc/media.php index 9d3e90a54..07351e48b 100644 --- a/inc/media.php +++ b/inc/media.php @@ -332,7 +332,7 @@ function media_save($file, $id, $ow, $auth, $move) { global $lang, $conf; // get filename - $id = cleanID($id,false,true); + $id = cleanID($id); $fn = mediaFN($id); // get filetype regexp diff --git a/inc/pageutils.php b/inc/pageutils.php index 31b5f9ff9..151fa5987 100644 --- a/inc/pageutils.php +++ b/inc/pageutils.php @@ -92,7 +92,7 @@ function getID($param='id',$clean=true){ * @author Andreas Gohr * @param string $raw_id The pageid to clean * @param boolean $ascii Force ASCII - * @param boolean $media Allow leading or trailing _ for media files + * @param boolean $media DEPRECATED */ function cleanID($raw_id,$ascii=false,$media=false){ global $conf; @@ -132,7 +132,7 @@ function cleanID($raw_id,$ascii=false,$media=false){ //clean up $id = preg_replace($sepcharpat,$sepchar,$id); $id = preg_replace('#:+#',':',$id); - $id = ($media ? trim($id,':.-') : trim($id,':._-')); + $id = trim($id,':._-'); $id = preg_replace('#:[:\._\-]+#',':',$id); $id = preg_replace('#[:\._\-]+:#',':',$id); diff --git a/lib/exe/ajax.php b/lib/exe/ajax.php index f8d62cb57..8edd559d6 100644 --- a/lib/exe/ajax.php +++ b/lib/exe/ajax.php @@ -257,7 +257,7 @@ function ajax_mediaupload(){ $id = $_GET['qqfile']; } - $id = cleanID($id, false, true); + $id = cleanID($id); $NS = $_REQUEST['ns']; $ns = $NS.':'.getNS($id); -- cgit v1.2.3 From 3f3bb97fcdd30282632d96a5bb19d2ea61c01504 Mon Sep 17 00:00:00 2001 From: Dominik Eckelmann Date: Mon, 28 Nov 2011 20:59:49 +0100 Subject: removed dublicated content --- inc/remote.php | 3 ++- lib/exe/xmlrpc.php | 13 +++++-------- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/inc/remote.php b/inc/remote.php index 6f48d2015..14f6614f1 100644 --- a/inc/remote.php +++ b/inc/remote.php @@ -130,4 +130,5 @@ class RemoteAPI { } -class RemoteException extends Exception {} \ No newline at end of file +class RemoteException extends Exception {} +class RemoteAccessDenied extends RemoteException {} \ No newline at end of file diff --git a/lib/exe/xmlrpc.php b/lib/exe/xmlrpc.php index e5e3298ae..cb8dbf42d 100644 --- a/lib/exe/xmlrpc.php +++ b/lib/exe/xmlrpc.php @@ -21,6 +21,7 @@ if(!$conf['xmlrpc']) die('XML-RPC server not enabled.'); class dokuwiki_xmlrpc_server extends IXR_IntrospectionServer { var $methods = array(); var $public_methods = array(); + var $remote; /** * Checks if the current user is allowed to execute non anonymous methods @@ -67,6 +68,7 @@ class dokuwiki_xmlrpc_server extends IXR_IntrospectionServer { * Constructor. Register methods and run Server */ function dokuwiki_xmlrpc_server(){ + $this->remote = new RemoteAPI(); $this->IXR_IntrospectionServer(); /* DokuWiki's own methods */ @@ -284,16 +286,11 @@ class dokuwiki_xmlrpc_server extends IXR_IntrospectionServer { * Return a raw wiki page */ function rawPage($id,$rev=''){ - $id = cleanID($id); - if(auth_quickaclcheck($id) < AUTH_READ){ + try { + return $this->remote->rawPage($id, $rev); + } catch(RemoteAccessDenied $e) { return new IXR_Error(1, 'You are not allowed to read this page'); } - $text = rawWiki($id,$rev); - if(!$text) { - return pageTemplate($id); - } else { - return $text; - } } /** -- cgit v1.2.3 From 04dd9c85e28535b43c7821841cd97b52682adae3 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Mon, 28 Nov 2011 22:14:20 +0000 Subject: fixed link wizard being appended to every div.dokuwiki (FS#2395) and changed div.dokuwiki to just .dokuwiki (some templates have the class in the body) --- lib/scripts/linkwiz.js | 2 +- lib/scripts/page.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/scripts/linkwiz.js b/lib/scripts/linkwiz.js index dcfafd75e..5075a0ab8 100644 --- a/lib/scripts/linkwiz.js +++ b/lib/scripts/linkwiz.js @@ -41,7 +41,7 @@ var dw_linkwiz = { 'left': (pos.left+80)+'px' }) .hide() - .appendTo('div.dokuwiki'); + .appendTo('.dokuwiki:first'); dw_linkwiz.textArea = $editor[0]; dw_linkwiz.result = jQuery('#link__wiz_result')[0]; diff --git a/lib/scripts/page.js b/lib/scripts/page.js index 55a844f0b..5da4a9cc0 100644 --- a/lib/scripts/page.js +++ b/lib/scripts/page.js @@ -55,7 +55,7 @@ dw_page = { .attr('id', popup_id) .addClass('insitu-footnote JSpopup') .mouseleave(function () {jQuery(this).hide();}); - jQuery('div.dokuwiki:first').append($fndiv); + jQuery('.dokuwiki:first').append($fndiv); } // position() does not support hidden elements -- cgit v1.2.3 From 1c122589394bb9150f09facdcd6e75d054eb69a4 Mon Sep 17 00:00:00 2001 From: Tim Roes Date: Tue, 29 Nov 2011 19:17:59 +0100 Subject: Using sensefull error codes. Since there are currently a lot of error coded returning 1, that mean completly different thing, i guess it would be very nice to change this. A client should not be forced to parse the error message, the error code should be enough to explain the error. This change suggests some error codes, that have a hierarchical structure. In the following list the categories begin with = and the error codes actually used with -. = 100 Page errors == 110 Page access errors --- 111 User is not allowed to read the requested page --- 112 User is not allowed to edit the page == 120 Page existance errors --- 121 The requested page does not exist == 130 Page edit errors --- 131 Empty page id --- 132 Empty page content --- 133 Page is locked --- 134 Positive wordblock check = 200 Media errors == 210 Media access errors --- 211 User is not allowed to read media --- 215 User is not allowed to list media == 220 Media existance errors --- 221 The requested media does not exist = 300 Search errors == 310 Argument errors --- 311 The provided value is not a valid timestamp == 320 Search result errors --- 321 No chances in specified timeframe --- lib/exe/xmlrpc.php | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/lib/exe/xmlrpc.php b/lib/exe/xmlrpc.php index 3a05c886d..5d19725a3 100644 --- a/lib/exe/xmlrpc.php +++ b/lib/exe/xmlrpc.php @@ -286,7 +286,7 @@ class dokuwiki_xmlrpc_server extends IXR_IntrospectionServer { function rawPage($id,$rev=''){ $id = cleanID($id); if(auth_quickaclcheck($id) < AUTH_READ){ - return new IXR_Error(1, 'You are not allowed to read this page'); + return new IXR_Error(111, 'You are not allowed to read this page'); } $text = rawWiki($id,$rev); if(!$text) { @@ -304,11 +304,11 @@ class dokuwiki_xmlrpc_server extends IXR_IntrospectionServer { function getAttachment($id){ $id = cleanID($id); if (auth_quickaclcheck(getNS($id).':*') < AUTH_READ) - return new IXR_Error(1, 'You are not allowed to read this file'); + return new IXR_Error(211, 'You are not allowed to read this file'); $file = mediaFN($id); if (!@ file_exists($file)) - return new IXR_Error(1, 'The requested file does not exist'); + return new IXR_Error(221, 'The requested file does not exist'); $data = io_readFile($file, false); $base64 = new IXR_Base64($data); @@ -342,7 +342,7 @@ class dokuwiki_xmlrpc_server extends IXR_IntrospectionServer { function htmlPage($id,$rev=''){ $id = cleanID($id); if(auth_quickaclcheck($id) < AUTH_READ){ - return new IXR_Error(1, 'You are not allowed to read this page'); + return new IXR_Error(111, 'You are not allowed to read this page'); } return p_wiki_xhtml($id,$rev,false); } @@ -462,7 +462,7 @@ class dokuwiki_xmlrpc_server extends IXR_IntrospectionServer { } return $data; } else { - return new IXR_Error(1, 'You are not allowed to list media files.'); + return new IXR_Error(215, 'You are not allowed to list media files.'); } } @@ -479,12 +479,12 @@ class dokuwiki_xmlrpc_server extends IXR_IntrospectionServer { function pageInfo($id,$rev=''){ $id = cleanID($id); if(auth_quickaclcheck($id) < AUTH_READ){ - return new IXR_Error(1, 'You are not allowed to read this page'); + return new IXR_Error(111, 'You are not allowed to read this page'); } $file = wikiFN($id,$rev); $time = @filemtime($file); if(!$time){ - return new IXR_Error(10, 'The requested page does not exist'); + return new IXR_Error(121, 'The requested page does not exist'); } $info = getRevisionInfo($id, $time, 1024); @@ -515,22 +515,22 @@ class dokuwiki_xmlrpc_server extends IXR_IntrospectionServer { $minor = $params['minor']; if(empty($id)) - return new IXR_Error(1, 'Empty page ID'); + return new IXR_Error(131, 'Empty page ID'); if(!page_exists($id) && trim($TEXT) == '' ) { - return new IXR_ERROR(1, 'Refusing to write an empty new wiki page'); + return new IXR_ERROR(132, 'Refusing to write an empty new wiki page'); } if(auth_quickaclcheck($id) < AUTH_EDIT) - return new IXR_Error(1, 'You are not allowed to edit this page'); + return new IXR_Error(112, 'You are not allowed to edit this page'); // Check, if page is locked if(checklock($id)) - return new IXR_Error(1, 'The page is currently locked'); + return new IXR_Error(133, 'The page is currently locked'); // SPAM check if(checkwordblock()) - return new IXR_Error(1, 'Positive wordblock check'); + return new IXR_Error(134, 'Positive wordblock check'); // autoset summary on new pages if(!page_exists($id) && empty($sum)) { @@ -635,7 +635,7 @@ class dokuwiki_xmlrpc_server extends IXR_IntrospectionServer { function listLinks($id) { $id = cleanID($id); if(auth_quickaclcheck($id) < AUTH_READ){ - return new IXR_Error(1, 'You are not allowed to read this page'); + return new IXR_Error(111, 'You are not allowed to read this page'); } $links = array(); @@ -684,7 +684,7 @@ class dokuwiki_xmlrpc_server extends IXR_IntrospectionServer { */ function getRecentChanges($timestamp) { if(strlen($timestamp) != 10) - return new IXR_Error(20, 'The provided value is not a valid timestamp'); + return new IXR_Error(311, 'The provided value is not a valid timestamp'); $recents = getRecentsSince($timestamp); @@ -705,7 +705,7 @@ class dokuwiki_xmlrpc_server extends IXR_IntrospectionServer { return $changes; } else { // in case we still have nothing at this point - return new IXR_Error(30, 'There are no changes in the specified timeframe'); + return new IXR_Error(321, 'There are no changes in the specified timeframe'); } } @@ -717,7 +717,7 @@ class dokuwiki_xmlrpc_server extends IXR_IntrospectionServer { */ function getRecentMediaChanges($timestamp) { if(strlen($timestamp) != 10) - return new IXR_Error(20, 'The provided value is not a valid timestamp'); + return new IXR_Error(311, 'The provided value is not a valid timestamp'); $recents = getRecentsSince($timestamp, null, '', RECENTS_MEDIA_CHANGES); @@ -738,7 +738,7 @@ class dokuwiki_xmlrpc_server extends IXR_IntrospectionServer { return $changes; } else { // in case we still have nothing at this point - return new IXR_Error(30, 'There are no changes in the specified timeframe'); + return new IXR_Error(321, 'There are no changes in the specified timeframe'); } } @@ -750,14 +750,14 @@ class dokuwiki_xmlrpc_server extends IXR_IntrospectionServer { function pageVersions($id, $first) { $id = cleanID($id); if(auth_quickaclcheck($id) < AUTH_READ){ - return new IXR_Error(1, 'You are not allowed to read this page'); + return new IXR_Error(111, 'You are not allowed to read this page'); } global $conf; $versions = array(); if(empty($id)) - return new IXR_Error(1, 'Empty page ID'); + return new IXR_Error(131, 'Empty page ID'); $revisions = getRevisions($id, $first, $conf['recent']+1); -- cgit v1.2.3 From f3046d2bbd96dc9a501975392e76d6ae539cdf05 Mon Sep 17 00:00:00 2001 From: Tim Roes Date: Tue, 29 Nov 2011 20:42:35 +0100 Subject: Second part of the error codes. Forgot some :( Added the new error codes and categories: --- 212 Not allowed to delete media == 230 Media edit error --- 231 Filename not given --- 232 File is still referenced --- 233 Could not delete file --- lib/exe/xmlrpc.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/exe/xmlrpc.php b/lib/exe/xmlrpc.php index 5d19725a3..910271461 100644 --- a/lib/exe/xmlrpc.php +++ b/lib/exe/xmlrpc.php @@ -575,7 +575,7 @@ class dokuwiki_xmlrpc_server extends IXR_IntrospectionServer { $auth = auth_quickaclcheck(getNS($id).':*'); if(!isset($id)) { - return new IXR_ERROR(1, 'Filename not given.'); + return new IXR_ERROR(231, 'Filename not given.'); } global $conf; @@ -611,11 +611,11 @@ class dokuwiki_xmlrpc_server extends IXR_IntrospectionServer { if ($res & DOKU_MEDIA_DELETED) { return 0; } elseif ($res & DOKU_MEDIA_NOT_AUTH) { - return new IXR_ERROR(1, "You don't have permissions to delete files."); + return new IXR_ERROR(212, "You don't have permissions to delete files."); } elseif ($res & DOKU_MEDIA_INUSE) { - return new IXR_ERROR(1, 'File is still referenced'); + return new IXR_ERROR(232, 'File is still referenced'); } else { - return new IXR_ERROR(1, 'Could not delete file'); + return new IXR_ERROR(233, 'Could not delete file'); } } -- cgit v1.2.3 From 4b7f30c244499fdfe9457b8d7a76566bee7d3abf Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Wed, 30 Nov 2011 00:37:52 +0000 Subject: bind JS for revision diff also when called through AJAX (fixes checkbox selection in history of new media manager, FS#2398) --- lib/scripts/behaviour.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/scripts/behaviour.js b/lib/scripts/behaviour.js index 20b408322..cffdde042 100644 --- a/lib/scripts/behaviour.js +++ b/lib/scripts/behaviour.js @@ -16,7 +16,7 @@ var dw_behaviour = { dw_behaviour.subscription(); dw_behaviour.revisionBoxHandler(); - jQuery('#page__revisions input[type=checkbox]').click( + jQuery('#page__revisions input[type=checkbox]').live('click', dw_behaviour.revisionBoxHandler ); }, -- cgit v1.2.3 From aafb4e36f7fdc95d371cffcf351c3611efd69945 Mon Sep 17 00:00:00 2001 From: Tim Roes Date: Thu, 1 Dec 2011 22:33:16 +0100 Subject: Fixed bug in XML-RPC search. The score was randomly transfered as string or as integer. This way it will always be transfered as an integer. --- lib/exe/xmlrpc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/exe/xmlrpc.php b/lib/exe/xmlrpc.php index 910271461..61e6f1e95 100644 --- a/lib/exe/xmlrpc.php +++ b/lib/exe/xmlrpc.php @@ -411,7 +411,7 @@ class dokuwiki_xmlrpc_server extends IXR_IntrospectionServer { $pages[] = array( 'id' => $id, - 'score' => $score, + 'score' => intval($score), 'rev' => filemtime($file), 'mtime' => filemtime($file), 'size' => filesize($file), -- cgit v1.2.3 From 449428695c0293a45517a610cf97193094f7a8b1 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Sun, 4 Dec 2011 16:48:21 +0000 Subject: fixed mediamanager diffs having no specific height (FS#2387) --- lib/tpl/default/_mediamanager.css | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/tpl/default/_mediamanager.css b/lib/tpl/default/_mediamanager.css index 383a1597c..198c7f440 100644 --- a/lib/tpl/default/_mediamanager.css +++ b/lib/tpl/default/_mediamanager.css @@ -405,11 +405,13 @@ position: relative; } #mediamanager__diff .imageDiff .image1, +#mediamanager__diff .imageDiff .image2 { + width: 97%; +} #mediamanager__diff .imageDiff .image2 { position: absolute; top: 0; left: 0; - width: 97%; } #mediamanager__diff .imageDiff.opacity .image2 { -- cgit v1.2.3 From b1ab5da7c783154a7ce22f4b34beb10b79f8768d Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Sun, 4 Dec 2011 17:32:25 +0000 Subject: fixed list type being sometimes undefined --- lib/scripts/media.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lib/scripts/media.js b/lib/scripts/media.js index 7f5514f56..267e64a76 100644 --- a/lib/scripts/media.js +++ b/lib/scripts/media.js @@ -371,6 +371,10 @@ var dw_mediamanager = { if (typeof new_val === 'undefined') { new_val = jQuery('form.options li.' + opt[1] + ' input') .filter(':checked').val(); + // if new_val is still undefined (because form.options is not in active tab), set to most spacious option + if (typeof new_val === 'undefined') { + new_val = 'thumbs'; + } } if (new_val !== dw_mediamanager.view_opts[opt[0]]) { -- cgit v1.2.3 From eea07c2327a7f78bb4f09b10f2b9805a2e6f5459 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Sun, 4 Dec 2011 17:56:28 +0000 Subject: fixed link in popup media manager to fullscreen media manager to open in correct namespace (FS#2401) --- inc/media.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/inc/media.php b/inc/media.php index 7fb163ade..e71bfd236 100644 --- a/inc/media.php +++ b/inc/media.php @@ -1364,7 +1364,7 @@ function media_printfile($item,$auth,$jump,$display_namespace=false){ 'alt="'.$lang['mediaview'].'" title="'.$lang['mediaview'].'" class="btn" />'; // mediamanager button - $link = wl('',array('do'=>'media','image'=>$item['id'])); + $link = wl('',array('do'=>'media','image'=>$item['id'],'ns'=>getNS($item['id']))); echo ' '; -- cgit v1.2.3 From 6d3ed70719f3f29ddcb490e55026c44c88a57dc3 Mon Sep 17 00:00:00 2001 From: dploeger Date: Tue, 29 Nov 2011 08:13:47 +0100 Subject: Added urldecoding of query for qsearch --- lib/exe/ajax.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/exe/ajax.php b/lib/exe/ajax.php index 8edd559d6..b7b92cceb 100644 --- a/lib/exe/ajax.php +++ b/lib/exe/ajax.php @@ -53,6 +53,8 @@ function ajax_qsearch(){ $query = $_POST['q']; if(empty($query)) $query = $_GET['q']; if(empty($query)) return; + + $query = urldecode($query); $data = ft_pageLookup($query, true, useHeading('navigation')); -- cgit v1.2.3 From 2e646d615cc45b435080af6f34c1af04e92be3c9 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Sun, 4 Dec 2011 18:48:07 +0000 Subject: fixed whitespace error introduced with 475aa19 --- lib/exe/ajax.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/exe/ajax.php b/lib/exe/ajax.php index b7b92cceb..46d835187 100644 --- a/lib/exe/ajax.php +++ b/lib/exe/ajax.php @@ -53,7 +53,7 @@ function ajax_qsearch(){ $query = $_POST['q']; if(empty($query)) $query = $_GET['q']; if(empty($query)) return; - + $query = urldecode($query); $data = ft_pageLookup($query, true, useHeading('navigation')); -- cgit v1.2.3 From 50cefcedd51b8d7e9ab3ca4ae5ef14cea35b7484 Mon Sep 17 00:00:00 2001 From: Andreas Haerter Date: Tue, 6 Dec 2011 00:39:18 +0100 Subject: Add missing German language values (config plugin) --- lib/plugins/config/lang/de-informal/lang.php | 1 + lib/plugins/config/lang/de/lang.php | 1 + 2 files changed, 2 insertions(+) diff --git a/lib/plugins/config/lang/de-informal/lang.php b/lib/plugins/config/lang/de-informal/lang.php index e63735edf..1a66c4a8e 100644 --- a/lib/plugins/config/lang/de-informal/lang.php +++ b/lib/plugins/config/lang/de-informal/lang.php @@ -66,6 +66,7 @@ $lang['useheading'] = 'Erste Überschrift als Seitennamen verwenden'; $lang['refcheck'] = 'Auf Verwendung beim Löschen von Media-Dateien testen'; $lang['refshow'] = 'Wie viele Verwendungsorte der Media-Datei zeigen'; $lang['allowdebug'] = 'Debug-Ausgaben erlauben Abschalten wenn nicht benötigt!'; +$lang['mediarevisions'] = 'Media-Revisionen (ältere Versionen) aktivieren?'; $lang['usewordblock'] = 'Blockiere Spam basierend auf der Wortliste'; $lang['indexdelay'] = 'Zeit bevor Suchmaschinenindexierung erlaubt ist'; $lang['relnofollow'] = 'rel="nofollow" verwenden'; diff --git a/lib/plugins/config/lang/de/lang.php b/lib/plugins/config/lang/de/lang.php index 1fb549597..a9a275349 100644 --- a/lib/plugins/config/lang/de/lang.php +++ b/lib/plugins/config/lang/de/lang.php @@ -77,6 +77,7 @@ $lang['useheading'] = 'Erste Überschrift als Seitennamen verwenden'; $lang['refcheck'] = 'Auf Verwendung beim Löschen von Media-Dateien testen'; $lang['refshow'] = 'Wiev iele Verwendungsorte der Media-Datei zeigen'; $lang['allowdebug'] = 'Debug-Ausgaben erlauben Abschalten wenn nicht benötigt!'; +$lang['mediarevisions'] = 'Media-Revisionen (ältere Versionen) aktivieren?'; $lang['usewordblock'] = 'Spam-Blocking benutzen'; $lang['indexdelay'] = 'Zeit bevor Suchmaschinenindexierung erlaubt ist'; $lang['relnofollow'] = 'rel="nofollow" verwenden'; -- cgit v1.2.3 From f18f20c04b2a0a93e9744a0b1ce4d39d26332360 Mon Sep 17 00:00:00 2001 From: Egil Hansen Date: Tue, 6 Dec 2011 09:46:39 +0100 Subject: Norwegian language update --- inc/lang/no/admin.txt | 2 +- inc/lang/no/adminplugins.txt | 2 +- inc/lang/no/conflict.txt | 2 +- inc/lang/no/denied.txt | 2 +- inc/lang/no/lang.php | 55 ++++++++++++++-------------- inc/lang/no/newpage.txt | 2 +- inc/lang/no/pwconfirm.txt | 2 +- inc/lang/no/recent.txt | 2 +- inc/lang/no/register.txt | 2 +- inc/lang/no/showrev.txt | 2 +- inc/lang/no/subscr_form.txt | 2 +- lib/plugins/acl/lang/no/help.txt | 2 +- lib/plugins/acl/lang/no/lang.php | 7 ++-- lib/plugins/config/lang/no/lang.php | 14 ++++--- lib/plugins/plugin/lang/no/admin_plugin.txt | 2 +- lib/plugins/plugin/lang/no/lang.php | 9 +++-- lib/plugins/popularity/lang/no/intro.txt | 4 +- lib/plugins/popularity/lang/no/lang.php | 3 +- lib/plugins/popularity/lang/no/submitted.txt | 2 +- lib/plugins/revert/lang/no/lang.php | 1 + lib/plugins/usermanager/lang/no/lang.php | 3 +- 21 files changed, 65 insertions(+), 57 deletions(-) diff --git a/inc/lang/no/admin.txt b/inc/lang/no/admin.txt index 99289a18b..765177fb3 100644 --- a/inc/lang/no/admin.txt +++ b/inc/lang/no/admin.txt @@ -1,3 +1,3 @@ ====== Administrasjon ====== -Nedenfor finner du en liste over administrative oppgaver tilgjengelig i DokuWiki. +Nedenfor finner du en liste over administrative oppgaver i DokuWiki. diff --git a/inc/lang/no/adminplugins.txt b/inc/lang/no/adminplugins.txt index 091ae4d7e..df78672d7 100644 --- a/inc/lang/no/adminplugins.txt +++ b/inc/lang/no/adminplugins.txt @@ -1 +1 @@ -====== Ekstra tillegg ====== \ No newline at end of file +====== Ekstra programtillegg ====== \ No newline at end of file diff --git a/inc/lang/no/conflict.txt b/inc/lang/no/conflict.txt index 855034685..49961d0df 100644 --- a/inc/lang/no/conflict.txt +++ b/inc/lang/no/conflict.txt @@ -1,6 +1,6 @@ ====== Det finnes en nyere versjon ====== -Det fins en nyere versjon av dokumentet du har redigert. Dette kan skje når en annen bruker redigerer dokumentet samtidig med deg. +Det fins en nyere utgave av dokumentet du har redigert. Dette kan skje når en annen bruker redigerer dokumentet samtidig med deg. Legg nøye merke til forskjellene som vises under, og velg deretter hvilken versjon du vil beholde. Om du velger ''**Lagre**'', så kommer din versjon til å lagres. Velg ''**Avbryt**'' for å beholde den nyeste versjonen (ikke din). diff --git a/inc/lang/no/denied.txt b/inc/lang/no/denied.txt index 4f8c9a188..6e7f1f28b 100644 --- a/inc/lang/no/denied.txt +++ b/inc/lang/no/denied.txt @@ -1,3 +1,3 @@ ====== Adgang forbudt ====== -Adgang forbudt. Kanskje du har glemt å logge deg inn? +Beklager, men du har ikke rettigheter til dette. Kanskje du har glemt å logge inn? diff --git a/inc/lang/no/lang.php b/inc/lang/no/lang.php index 88d21b536..76b59d9b8 100644 --- a/inc/lang/no/lang.php +++ b/inc/lang/no/lang.php @@ -17,6 +17,7 @@ * @author Erik Pedersen * @author Rune Rasmussen syntaxerror.no@gmail.com * @author Jon Bøe + * @author Egil Hansen */ $lang['encoding'] = 'utf-8'; $lang['direction'] = 'ltr'; @@ -26,7 +27,7 @@ $lang['singlequoteopening'] = '‘'; $lang['singlequoteclosing'] = '’'; $lang['apostrophe'] = '\''; $lang['btn_edit'] = 'Rediger denne siden'; -$lang['btn_source'] = 'Vis kildetekst'; +$lang['btn_source'] = 'Vis kildekode'; $lang['btn_show'] = 'Vis siden'; $lang['btn_create'] = 'Lag denne siden'; $lang['btn_search'] = 'Søk'; @@ -49,7 +50,7 @@ $lang['btn_delete'] = 'Slett'; $lang['btn_back'] = 'Tilbake'; $lang['btn_backlink'] = 'Tilbakelenker'; $lang['btn_backtomedia'] = 'Tilbake til valg av mediafil'; -$lang['btn_subscribe'] = 'Abonner på endringer'; +$lang['btn_subscribe'] = 'Abonnér på endringer'; $lang['btn_profile'] = 'Oppdater profil'; $lang['btn_reset'] = 'Tilbakestill'; $lang['btn_resendpwd'] = 'Send nytt passord'; @@ -86,28 +87,28 @@ $lang['reghere'] = 'Har du ikke en konto ennå? Lag deg en'; $lang['profna'] = 'Denne wikien støtter ikke profilendringer'; $lang['profnochange'] = 'Ingen endringer, ingenting å gjøre.'; $lang['profnoempty'] = 'Tomt navn- eller e-postfelt er ikke tillatt.'; -$lang['profchanged'] = 'Brukerprofil ble vellykket oppdatert.'; -$lang['pwdforget'] = 'Glemt ditt passord? Få deg et nytt'; -$lang['resendna'] = 'Denne wikien støtter ikke nyutsending.'; +$lang['profchanged'] = 'Brukerprofilen ble vellykket oppdatert.'; +$lang['pwdforget'] = 'Glemt passordet ditt? Få deg et nytt'; +$lang['resendna'] = 'Denne wikien støtter ikke nyutsending av passord.'; $lang['resendpwd'] = 'Send nytt passord for'; $lang['resendpwdmissing'] = 'Beklager, du må fylle inn alle felt.'; $lang['resendpwdnouser'] = 'Beklager, vi kan ikke finne denne brukeren i vår database.'; $lang['resendpwdbadauth'] = 'Beklager, denne autorisasjonskoden er ikke gyldig. Sjekk at du brukte hele bekreftelseslenken.'; $lang['resendpwdconfirm'] = 'En bekreftelseslenke er blitt sendt på e-post.'; $lang['resendpwdsuccess'] = 'Ditt nye passord er blitt sendt på e-post.'; -$lang['license'] = 'Der annet ikke er særskilt beskrevet, er innholdet på denne wiki regulert av følgende lisens:'; -$lang['licenseok'] = 'Merk: Ved å endre på denne siden godtar du at ditt innhold blir regulert av følgende lisens:'; +$lang['license'] = 'Der annet ikke er angitt, er innholdet på denne wiki utgitt under følgende lisens:'; +$lang['licenseok'] = 'Merk: Ved å endre på denne siden godtar du at ditt innhold utgis under følgende lisens:'; $lang['searchmedia'] = 'Søk filnavn'; $lang['searchmedia_in'] = 'Søk i %s'; $lang['txt_upload'] = 'Velg fil som skal lastes opp'; $lang['txt_filename'] = 'Skriv inn wikinavn (alternativt)'; $lang['txt_overwrt'] = 'Overskriv eksisterende fil'; -$lang['lockedby'] = 'Stengt av'; -$lang['lockexpire'] = 'Avstengningen opphører'; -$lang['js']['willexpire'] = 'Din redigeringslås for dette dokumentet kommer snart til å opphøre.\nFor å unngå versjonskonflikter bør du forhåndsvise dokumentet ditt for å forlenge redigeringslåsen.'; -$lang['js']['notsavedyet'] = 'Ulagrede endringer vil gå tapt. +$lang['lockedby'] = 'Låst av'; +$lang['lockexpire'] = 'Låsingen utløper'; +$lang['js']['willexpire'] = 'Din redigeringslås for dette dokumentet kommer snart til å utløpe.\nFor å unngå versjonskonflikter bør du forhåndsvise dokumentet ditt for å forlenge redigeringslåsen.'; +$lang['js']['notsavedyet'] = 'Ulagrede endringer vil gå tapt! Vil du fortsette?'; -$lang['js']['searchmedia'] = 'Søk for filer'; +$lang['js']['searchmedia'] = 'Søk etter filer'; $lang['js']['keepopen'] = 'Hold vindu åpent ved valg'; $lang['js']['hidedetails'] = 'Skjul detaljer'; $lang['js']['mediatitle'] = 'Lenkeinnstillinger'; @@ -117,16 +118,16 @@ $lang['js']['mediasize'] = 'Bildestørrelse'; $lang['js']['mediatarget'] = 'Lenkemål'; $lang['js']['mediaclose'] = 'Lukk'; $lang['js']['mediainsert'] = 'Sett inn'; -$lang['js']['mediadisplayimg'] = 'Vis bilde'; -$lang['js']['mediadisplaylnk'] = 'Vis bare lenken'; +$lang['js']['mediadisplayimg'] = 'Vis bilde.'; +$lang['js']['mediadisplaylnk'] = 'Vis bare lenken.'; $lang['js']['mediasmall'] = 'Liten versjon'; $lang['js']['mediamedium'] = 'Medium versjon'; $lang['js']['medialarge'] = 'Stor versjon'; $lang['js']['mediaoriginal'] = 'Original versjon'; -$lang['js']['medialnk'] = 'Lenke til detaljeside'; +$lang['js']['medialnk'] = 'Lenke til detaljside'; $lang['js']['mediadirect'] = 'Direktelenke til original'; $lang['js']['medianolnk'] = 'Ingen lenke'; -$lang['js']['medianolink'] = 'Ikke lenk bilde'; +$lang['js']['medianolink'] = 'Ikke lenk bildet'; $lang['js']['medialeft'] = 'Venstrejuster bilde'; $lang['js']['mediaright'] = 'Høyrejuster bilde'; $lang['js']['mediacenter'] = 'Midtstill bilde'; @@ -165,13 +166,13 @@ $lang['mediainuse'] = 'Filen "%s" har ikke biltt slettet - den er for $lang['namespaces'] = 'Navnerom'; $lang['mediafiles'] = 'Tilgjengelige filer i'; $lang['accessdenied'] = 'Du har ikke tilgang til å se denne siden'; -$lang['mediausage'] = 'Bruk følgende syntaks til å refferer til denne filen:'; +$lang['mediausage'] = 'Bruk følgende syntaks til å referere til denne filen:'; $lang['mediaview'] = 'Vis original fil'; $lang['mediaroot'] = 'rot'; $lang['mediaupload'] = 'Last opp en fil til gjeldende navnerom her. For å opprette undernavnerom, før dem opp før filnavn i "Last opp som" adskilt med kolon.'; $lang['mediaextchange'] = 'Filendelse endret fra .%s til .%s!'; $lang['reference'] = 'Referanser for'; -$lang['ref_inuse'] = 'Denne filen kan ikke slettes fordi den er fortsatt i bruk av følgende sider:'; +$lang['ref_inuse'] = 'Denne filen kan ikke slettes fordi den er fortsatt i bruk på følgende sider:'; $lang['ref_hidden'] = 'Noen referanser er på sider du ikke har tilgang til å lese'; $lang['hits'] = 'Treff'; $lang['quickhits'] = 'Matchende wikinavn'; @@ -187,7 +188,7 @@ $lang['diff_side'] = 'Side ved side'; $lang['line'] = 'Linje'; $lang['breadcrumb'] = 'Spor'; $lang['youarehere'] = 'Du er her'; -$lang['lastmod'] = 'Sist modifisert'; +$lang['lastmod'] = 'Sist endret'; $lang['by'] = 'av'; $lang['deleted'] = 'fjernet'; $lang['created'] = 'opprettet'; @@ -258,15 +259,15 @@ $lang['subscr_not_subscribed'] = '%s abonnerer ikke på %s'; $lang['subscr_m_not_subscribed'] = 'Du abonnerer ikke på denne sida eller dette navnerommet'; $lang['subscr_m_new_header'] = 'Legg til abonnement'; $lang['subscr_m_current_header'] = 'Gjeldende abonnementer'; -$lang['subscr_m_unsubscribe'] = 'Avmeld'; -$lang['subscr_m_subscribe'] = 'Påmeld'; +$lang['subscr_m_unsubscribe'] = 'Stoppe abonnement'; +$lang['subscr_m_subscribe'] = 'Abonnere på'; $lang['subscr_m_receive'] = 'Motta'; $lang['subscr_style_every'] = 'e-post for alle endringer'; $lang['subscr_style_digest'] = 'e-post med sammendrag av endringer for hver side (%.2f dager mellom hver)'; $lang['subscr_style_list'] = 'liste med sider som er endra siden forrige e-post (%.2f dager mellom hver)'; $lang['authmodfailed'] = 'Feilkonfigurert brukerautorisasjon. Vennligst innformer Wiki-admin.'; $lang['authtempfail'] = 'Brukerautorisasjon er midlertidig utilgjengelig. Om dette vedvarer, vennligst informer Wiki-admin.'; -$lang['i_chooselang'] = 'Velg ditt språk'; +$lang['i_chooselang'] = 'Velg språk'; $lang['i_installer'] = 'DokuWiki-installasjon'; $lang['i_wikiname'] = 'Wikinavn'; $lang['i_enableacl'] = 'Aktiver ACL (anbefalt)'; @@ -276,7 +277,7 @@ $lang['i_modified'] = 'For sikkerhets skyld vil dette skriptet bare v Du bør enten pakke ut filene på nytt fra den nedlastede pakken, eller konsultere den komplette Dokuwiki-installasjonsinstruksen'; $lang['i_funcna'] = 'PHP-funksjonen %s er ikke tilgjengelig. Kanskje din leverandør har deaktivert den av noen grunn?'; -$lang['i_phpver'] = 'Your PHP version %s is lower than the needed %s. You need to upgrade your PHP install.'; +$lang['i_phpver'] = 'Din PHP versjon %s er lavere enn kravet %s. Du må oppgradere PHP installasjonen. '; $lang['i_permfail'] = '%s er ikke skrivbar for DokuWiki. Du må fikse rettighetene for denne mappen!'; $lang['i_confexists'] = '%s eksisterer allerede'; $lang['i_writeerr'] = 'Kunne ikke opprette %s. Du må sjekke mappe-/filrettigheter og opprette filen manuelt.'; @@ -296,11 +297,11 @@ $lang['mu_intro'] = 'Her kan du laste opp flere filer samtidig. Kli $lang['mu_gridname'] = 'Filnavn'; $lang['mu_gridsize'] = 'Størrelse'; $lang['mu_gridstat'] = 'Status'; -$lang['mu_namespace'] = 'Navnerom (Namespace)'; +$lang['mu_namespace'] = 'Navnerom'; $lang['mu_browse'] = 'Utforsk'; $lang['mu_toobig'] = 'for stor'; $lang['mu_ready'] = 'klar for opplasting'; -$lang['mu_done'] = 'komplett'; +$lang['mu_done'] = 'ferdig'; $lang['mu_fail'] = 'feilet'; $lang['mu_authfail'] = 'sesjonen har utløpt'; $lang['mu_progress'] = '@PCT@% lastet opp'; @@ -333,10 +334,10 @@ $lang['media_search'] = 'Søk i navnerommet %s.'; $lang['media_view'] = '%s'; $lang['media_viewold'] = '%s på %s'; $lang['media_edit'] = 'Rediger'; -$lang['media_history'] = 'Dette er de tidligere versjonene av fila.'; +$lang['media_history'] = 'Dette er de tidligere versjonene av filen.'; $lang['media_meta_edited'] = 'metadata er endra'; $lang['media_perm_read'] = 'Beklager, du har ikke tilgang til å lese filer.'; $lang['media_perm_upload'] = 'Beklager, du har ikke tilgang til å laste opp filer.'; $lang['media_update'] = 'Last opp ny versjon'; $lang['media_restore'] = 'Gjenopprett denne versjonen'; -$lang['plugin_install_err'] = 'Tillegget ble feil installert. Skift navn på mappa \'%s\' til \'%s\'.'; +$lang['plugin_install_err'] = 'Tillegget ble feil installert. Skift navn på mappen \'%s\' til \'%s\'.'; diff --git a/inc/lang/no/newpage.txt b/inc/lang/no/newpage.txt index f712998d2..86cad00ed 100644 --- a/inc/lang/no/newpage.txt +++ b/inc/lang/no/newpage.txt @@ -1,3 +1,3 @@ ====== Dette emnet har ikke noe innhold ====== -Du har klikket på en lenke til et emne som ikke finnes ennå. Du kan skape det gjennom å klikke på ''**Lag denne siden**''. +Du har klikket på en lenke til et emne som ikke finnes ennå. Du kan opprette det ved å klikke på ''**Lag denne siden**''. diff --git a/inc/lang/no/pwconfirm.txt b/inc/lang/no/pwconfirm.txt index 9b8a0ab3e..36163c6e7 100644 --- a/inc/lang/no/pwconfirm.txt +++ b/inc/lang/no/pwconfirm.txt @@ -3,7 +3,7 @@ Hei @FULLNAME@! Noen har bedt om nytt passord for din @TITLE@ innlogging på @DOKUWIKIURL@ -Om du ikke bad om nytt passord kan du bare overse denne e-posten. +Om du ikke ba om nytt passord kan du bare overse denne e-posten. For å bekrefte at forespørselen virkelig kom fra deg kan du bruke følgende lenke: diff --git a/inc/lang/no/recent.txt b/inc/lang/no/recent.txt index d9357b1a4..857013c32 100644 --- a/inc/lang/no/recent.txt +++ b/inc/lang/no/recent.txt @@ -1,5 +1,5 @@ ====== Siste nytt ====== -Følgende sider/dokumenter har nylig blitt oppdatert. +Følgende sider har nylig blitt oppdatert. diff --git a/inc/lang/no/register.txt b/inc/lang/no/register.txt index 1ce95c44d..160e47364 100644 --- a/inc/lang/no/register.txt +++ b/inc/lang/no/register.txt @@ -1,4 +1,4 @@ ====== Registrer deg som bruker ====== -Angi all informasjon som det blir spurt om nedenfor for å skape en ny brukerkonto for denne wiki. Vær spesielt nøye med å angi en **gyldig e-postadresse** - ditt passord vil bli sendt til den e-postadressen du angir. Brukernavnet må være et gyldig [[doku>pagename|sidenavn]]. +Angi all informasjon som det blir spurt om nedenfor for å lage en ny brukerkonto for denne wikien. Vær spesielt nøye med å angi en **gyldig e-postadresse** - ditt passord vil bli sendt til den e-postadressen du angir. Brukernavnet må være et gyldig [[doku>pagename|sidenavn]]. diff --git a/inc/lang/no/showrev.txt b/inc/lang/no/showrev.txt index 556896437..06514f2bd 100644 --- a/inc/lang/no/showrev.txt +++ b/inc/lang/no/showrev.txt @@ -1,2 +1,2 @@ -**Dette er en gammel revisjon av dokumentet!** +**Dette er en gammel utgave av dokumentet!** ---- diff --git a/inc/lang/no/subscr_form.txt b/inc/lang/no/subscr_form.txt index c3df69e02..f62b25bec 100644 --- a/inc/lang/no/subscr_form.txt +++ b/inc/lang/no/subscr_form.txt @@ -1,3 +1,3 @@ ====== Administrere abonnement ====== -Denne sida lar deg administrere abonnementene dine for denne sida og dette navnerommet. \ No newline at end of file +Denne siden lar deg administrere abonnementene dine for denne siden og dette navnerommet. \ No newline at end of file diff --git a/lib/plugins/acl/lang/no/help.txt b/lib/plugins/acl/lang/no/help.txt index f02b6bdbd..c3d3688a9 100644 --- a/lib/plugins/acl/lang/no/help.txt +++ b/lib/plugins/acl/lang/no/help.txt @@ -1,4 +1,4 @@ -===Lynhjelp=== +=== Hurtighjelp: === På denne siden kan du legge til og fjerne tillatelser for navnerom og sider i din wiki. diff --git a/lib/plugins/acl/lang/no/lang.php b/lib/plugins/acl/lang/no/lang.php index 587f9c2fc..09d71937a 100644 --- a/lib/plugins/acl/lang/no/lang.php +++ b/lib/plugins/acl/lang/no/lang.php @@ -17,6 +17,7 @@ * @author Erik Bjørn Pedersen * @author Rune Rasmussen syntaxerror.no@gmail.com * @author Jon Bøe + * @author Egil Hansen */ $lang['admin_acl'] = 'Administrasjon av lister for adgangskontroll (ACL)'; $lang['acl_group'] = 'Gruppe'; @@ -34,10 +35,10 @@ $lang['p_choose_ns'] = 'Før inn en bruker eller gruppe i skjem $lang['p_inherited'] = 'Merk: Disse tillatelser ble ikke eksplisitt satt, men ble arvet fra andre grupper eller høyere navnerom.'; $lang['p_isadmin'] = 'Merk: Den valgte gruppen eller bruker har altid fulle tillatelser fordi vedkommende er konfigurert som superbruker.'; $lang['p_include'] = 'Høyere tillgangsrettigheter inkluderer lavere. Rettigheter for å opprette, laste opp og slette gjelder bare for navnerom, ikke enkeltsider.'; -$lang['current'] = 'Någjeldende ACL-regler'; +$lang['current'] = 'Gjeldende ACL-regler'; $lang['where'] = 'Side/Navnerom'; $lang['who'] = 'Bruker/Gruppe'; -$lang['perm'] = 'Tillatelser'; +$lang['perm'] = 'Rettigheter'; $lang['acl_perm0'] = 'Ingen'; $lang['acl_perm1'] = 'Lese'; $lang['acl_perm2'] = 'Redigere'; @@ -45,4 +46,4 @@ $lang['acl_perm4'] = 'Opprette'; $lang['acl_perm8'] = 'Laste opp'; $lang['acl_perm16'] = 'Slette'; $lang['acl_new'] = 'Legg til ny oppføring'; -$lang['acl_mod'] = 'Modifiser oppføring'; +$lang['acl_mod'] = 'Endre oppføring'; diff --git a/lib/plugins/config/lang/no/lang.php b/lib/plugins/config/lang/no/lang.php index 3c4890149..c41b5e566 100644 --- a/lib/plugins/config/lang/no/lang.php +++ b/lib/plugins/config/lang/no/lang.php @@ -14,6 +14,7 @@ * @author Erik Bjørn Pedersen * @author Rune Rasmussen syntaxerror.no@gmail.com * @author Jon Bøe + * @author Egil Hansen */ $lang['menu'] = 'Konfigurasjonsinnstillinger'; $lang['error'] = 'Innstillingene ble ikke oppdatert på grunn av en eller flere ugyldig verdier. Vennligst se gjennom endringene og prøv på nytt. @@ -24,10 +25,10 @@ $lang['locked'] = 'Innstillingene kan ikke oppdateres. Hvis dette forsikre deg om at fila med de lokale innstillingene har korrekt filnavn
og tillatelser.'; $lang['danger'] = 'Advarsel: Endrig av dette valget kan føre til at wiki og konfigurasjon menyen ikke blir tilgjengelig.'; -$lang['warning'] = 'Advarsel: Endring av dette valget kan føre til utilsiktede atferd. +$lang['warning'] = 'Advarsel: Endring av dette valget kan føre til utilsiktet atferd. '; -$lang['security'] = 'Sikkerhets Advarsel: Endring av dette valget kan føre til sikkerhetsrisiko.'; +$lang['security'] = 'Sikkerhetsadvarsel: Endring av dette valget kan innebære en sikkerhetsrisiko.'; $lang['_configuration_manager'] = 'Konfigurasjonsinnstillinger'; $lang['_header_dokuwiki'] = 'Innstillinger for DokuWiki'; $lang['_header_plugin'] = 'Innstillinger for tillegg'; @@ -36,10 +37,10 @@ $lang['_header_undefined'] = 'Udefinerte innstillinger'; $lang['_basic'] = 'Grunnleggende innstillinger'; $lang['_display'] = 'Innstillinger for visning av sider'; $lang['_authentication'] = 'Innstillinger for autentisering'; -$lang['_anti_spam'] = 'Motsøppel-innstillinger'; +$lang['_anti_spam'] = 'Anti-Spam innstillinger'; $lang['_editing'] = 'Innstillinger for redigering'; $lang['_links'] = 'Innstillinger for lenker'; -$lang['_media'] = 'Innstillinger for media-filer'; +$lang['_media'] = 'Innstillinger for mediafiler'; $lang['_advanced'] = 'Avanserte innstillinger'; $lang['_network'] = 'Nettverksinnstillinger'; $lang['_plugin_sufix'] = '– innstillinger for tillegg'; @@ -77,6 +78,7 @@ $lang['useheading'] = 'Bruk første overskrift som tittel'; $lang['refcheck'] = 'Sjekk referanser før mediafiler slettes'; $lang['refshow'] = 'Antall viste referanser til mediafiler'; $lang['allowdebug'] = 'Tillat feilsøking skru av om det ikke behøves!'; +$lang['mediarevisions'] = 'Slå på mediaversjonering?'; $lang['usewordblock'] = 'Blokker søppel basert på ordliste'; $lang['indexdelay'] = 'Forsinkelse før indeksering (sekunder)'; $lang['relnofollow'] = 'Bruk rel="nofollow" på eksterne lenker'; @@ -193,10 +195,10 @@ $lang['xsendfile_o_2'] = 'Standard X-Sendfile header'; $lang['xsendfile_o_3'] = 'Priprietær Nginx X-Accel-Redirect header'; $lang['showuseras_o_loginname'] = 'Brukernavn'; $lang['showuseras_o_username'] = 'Brukerens fulle navn'; -$lang['showuseras_o_email'] = 'Brukerens epostadresse (tilpasset i henhold til mailguar-instilling)'; +$lang['showuseras_o_email'] = 'Brukerens e-postadresse (tilpasset i henhold til mailguar-instilling)'; $lang['showuseras_o_email_link'] = 'Brukerens epost-addresse som "mailto:"-lenke'; $lang['useheading_o_0'] = 'Aldri'; $lang['useheading_o_navigation'] = 'Kun navigering'; $lang['useheading_o_content'] = 'Kun wiki-innhold'; $lang['useheading_o_1'] = 'Alltid'; -$lang['readdircache'] = 'Maksimal alder for mellomlagring av mappa med søkeindekser (sekunder)'; +$lang['readdircache'] = 'Maksimal alder for mellomlagring av mappen med søkeindekser (sekunder)'; diff --git a/lib/plugins/plugin/lang/no/admin_plugin.txt b/lib/plugins/plugin/lang/no/admin_plugin.txt index f1b63b992..1765b671d 100644 --- a/lib/plugins/plugin/lang/no/admin_plugin.txt +++ b/lib/plugins/plugin/lang/no/admin_plugin.txt @@ -1,3 +1,3 @@ -====== Behandle tillegg ====== +====== Behandle programtillegg ====== På denne siden kan du behandle alt som har å gjøre med DokuWikis [[doku>plugins|tillegg]]. For å kunne laste ned og installere et tillegg må webserveren ha skrivetilgang til mappen for tillegg. diff --git a/lib/plugins/plugin/lang/no/lang.php b/lib/plugins/plugin/lang/no/lang.php index 41f6d1153..829d29387 100644 --- a/lib/plugins/plugin/lang/no/lang.php +++ b/lib/plugins/plugin/lang/no/lang.php @@ -14,10 +14,11 @@ * @author Erik Bjørn Pedersen * @author Rune Rasmussen syntaxerror.no@gmail.com * @author Jon Bøe + * @author Egil Hansen */ -$lang['menu'] = 'Behandle tillegg'; -$lang['download'] = 'Last ned og installer et tillegg'; -$lang['manage'] = 'Installerte tillegg'; +$lang['menu'] = 'Behandle programtillegg'; +$lang['download'] = 'Last ned og installer et programtillegg'; +$lang['manage'] = 'Installerte programtillegg'; $lang['btn_info'] = 'informasjon'; $lang['btn_update'] = 'oppdater'; $lang['btn_delete'] = 'slett'; @@ -31,7 +32,7 @@ $lang['source'] = 'Kilde:'; $lang['unknown'] = 'ukjent'; $lang['updating'] = 'Oppdaterer ...'; $lang['updated'] = 'Tillegget %s er oppdatert'; -$lang['updates'] = 'De følgende tilleggene har blitt oppdatert'; +$lang['updates'] = 'Følgende programtillegg har blitt oppdatert'; $lang['update_none'] = 'Ingen oppdateringer funnet.'; $lang['deleting'] = 'Sletter ...'; $lang['deleted'] = 'Tillegget %s ble slettet.'; diff --git a/lib/plugins/popularity/lang/no/intro.txt b/lib/plugins/popularity/lang/no/intro.txt index 3e67d793c..a0f360157 100644 --- a/lib/plugins/popularity/lang/no/intro.txt +++ b/lib/plugins/popularity/lang/no/intro.txt @@ -1,9 +1,9 @@ ====== Popularitetsfeedback ====== -Dette verktøyet samler anonyme data om din wiki og lar deg sende det tilbake til DokuWikis utviklere. Dette hjelper utviklerne å forstå hvordan DokuWiki blir brukt av dets brukere, og gjør at fremtidig beslutninger om videre utvikling kan tuftes på statistikk fra virkelig bruk. +Dette verktøyet samler anonyme data om din wiki og lar deg sende det tilbake til DokuWikis utviklere. Dette hjelper utviklerne å forstå hvordan DokuWiki blir brukt av brukerne, og gjør at fremtidig beslutninger om videre utvikling kan baseres på statistikk fra virkelig bruk. Du oppfordres herved til å gjenta dette skrittet fra tid til annen for å holde utviklerne informert når din wiki vokser. Ditt gjentatte datasett blir identifisert vha en anonym ID. De data som samles inn inneholder informasjon som din DokuWiki-versjon, antallet og størrelsen på sider og filer, installerte plugins og informasjon om din installerte PHP. -Rådata som blir sendt vises nedenfor. Vennligst bruk knappen "Send data" for å overføre informasjonen. \ No newline at end of file +Rådata som blir sendt vises nedenfor. Bruk knappen "Send data" for å overføre informasjonen. \ No newline at end of file diff --git a/lib/plugins/popularity/lang/no/lang.php b/lib/plugins/popularity/lang/no/lang.php index e283fc371..df38f6e0e 100644 --- a/lib/plugins/popularity/lang/no/lang.php +++ b/lib/plugins/popularity/lang/no/lang.php @@ -12,11 +12,12 @@ * @author Rune Rasmussen syntaxerror.no@gmail.com * @author Thomas Nygreen * @author Jon Bøe + * @author Egil Hansen */ $lang['name'] = 'Popularitetsfeedback (kan ta litt tid å laste)'; $lang['submit'] = 'Send data'; $lang['autosubmit'] = 'Send data automatisk en gang i måneden'; $lang['submissionFailed'] = 'Kunne ikke sende dataene på grunn av følgende feil:'; $lang['submitDirectly'] = 'Du kan sende dataene manuelt ved å sende inn dette skjemaet.'; -$lang['autosubmitError'] = 'Den siste automatiske innsendinga feilet på grunn av følgende feil:'; +$lang['autosubmitError'] = 'Den siste automatiske innsendingen feilet på grunn av følgende feil:'; $lang['lastSent'] = 'Dataene er sendt'; diff --git a/lib/plugins/popularity/lang/no/submitted.txt b/lib/plugins/popularity/lang/no/submitted.txt index 239676a9d..ccec7674e 100644 --- a/lib/plugins/popularity/lang/no/submitted.txt +++ b/lib/plugins/popularity/lang/no/submitted.txt @@ -1,3 +1,3 @@ ====== Tilbakemelding om popularitet ====== -Innsending av dataene var vellykka. \ No newline at end of file +Innsending av dataene var vellykket. \ No newline at end of file diff --git a/lib/plugins/revert/lang/no/lang.php b/lib/plugins/revert/lang/no/lang.php index 2a6a2abd3..299b12ea7 100644 --- a/lib/plugins/revert/lang/no/lang.php +++ b/lib/plugins/revert/lang/no/lang.php @@ -14,6 +14,7 @@ * @author Erik Bjørn Pedersen * @author Rune Rasmussen syntaxerror.no@gmail.com * @author Jon Bøe + * @author Egil Hansen */ $lang['menu'] = 'Tilbakestillingsbehandler'; $lang['filter'] = 'Søk etter søppelmeldinger'; diff --git a/lib/plugins/usermanager/lang/no/lang.php b/lib/plugins/usermanager/lang/no/lang.php index 668863ec2..7124e4811 100644 --- a/lib/plugins/usermanager/lang/no/lang.php +++ b/lib/plugins/usermanager/lang/no/lang.php @@ -14,6 +14,7 @@ * @author Erik Bjørn Pedersen * @author Rune Rasmussen syntaxerror.no@gmail.com * @author Jon Bøe + * @author Egil Hansen */ $lang['menu'] = 'Behandle brukere'; $lang['noauth'] = '(autentisering av brukere ikke tilgjengelig)'; @@ -28,7 +29,7 @@ $lang['field'] = 'Felt'; $lang['value'] = 'Verdi'; $lang['add'] = 'Legg til'; $lang['delete'] = 'Slett'; -$lang['delete_selected'] = 'Slett utvalgte'; +$lang['delete_selected'] = 'Slett valgte'; $lang['edit'] = 'Rediger'; $lang['edit_prompt'] = 'Rediger denne brukeren'; $lang['modify'] = 'Lagre endringer'; -- cgit v1.2.3 From 77b9cb8455942e8998e88f6977e3486959ed1b1a Mon Sep 17 00:00:00 2001 From: Ricardo Guijt Date: Thu, 8 Dec 2011 12:23:53 +0100 Subject: Dutch language update --- inc/lang/nl/lang.php | 1 + lib/plugins/acl/lang/nl/lang.php | 1 + lib/plugins/config/lang/nl/lang.php | 2 ++ lib/plugins/plugin/lang/nl/lang.php | 1 + lib/plugins/popularity/lang/nl/lang.php | 1 + lib/plugins/revert/lang/nl/lang.php | 1 + lib/plugins/usermanager/lang/nl/lang.php | 1 + 7 files changed, 8 insertions(+) diff --git a/inc/lang/nl/lang.php b/inc/lang/nl/lang.php index 35dce121e..542b99c93 100644 --- a/inc/lang/nl/lang.php +++ b/inc/lang/nl/lang.php @@ -15,6 +15,7 @@ * @author Marijn Hofstra * @author Timon Van Overveldt * @author Jeroen + * @author Ricardo Guijt */ $lang['encoding'] = 'utf-8'; $lang['direction'] = 'ltr'; diff --git a/lib/plugins/acl/lang/nl/lang.php b/lib/plugins/acl/lang/nl/lang.php index 686909644..cb0765505 100644 --- a/lib/plugins/acl/lang/nl/lang.php +++ b/lib/plugins/acl/lang/nl/lang.php @@ -17,6 +17,7 @@ * @author Marijn Hofstra * @author Timon Van Overveldt * @author Jeroen + * @author Ricardo Guijt */ $lang['admin_acl'] = 'Toegangsrechten'; $lang['acl_group'] = 'Groep'; diff --git a/lib/plugins/config/lang/nl/lang.php b/lib/plugins/config/lang/nl/lang.php index 65385cc43..c98d05adb 100644 --- a/lib/plugins/config/lang/nl/lang.php +++ b/lib/plugins/config/lang/nl/lang.php @@ -14,6 +14,7 @@ * @author Marijn Hofstra * @author Timon Van Overveldt * @author Jeroen + * @author Ricardo Guijt */ $lang['menu'] = 'Configuratie-instellingen'; $lang['error'] = 'De instellingen zijn niet gewijzigd wegens een incorrecte waarde, kijk je wijzigingen na en sla dan opnieuw op.
Je kunt de incorrecte waarde(s) herkennen aan de rode rand.'; @@ -72,6 +73,7 @@ $lang['useheading'] = 'Eerste kopje voor paginanaam gebruiken'; $lang['refcheck'] = 'Controleer verwijzingen naar media'; $lang['refshow'] = 'Aantal te tonen mediaverwijzingen'; $lang['allowdebug'] = 'Debug toestaan uitzetten indien niet noodzakelijk!'; +$lang['mediarevisions'] = 'Media revisies activeren?'; $lang['usewordblock'] = 'Blokkeer spam op basis van woordenlijst'; $lang['indexdelay'] = 'Uitstel voor indexeren (sec)'; $lang['relnofollow'] = 'Gebruik rel="nofollow" voor externe links'; diff --git a/lib/plugins/plugin/lang/nl/lang.php b/lib/plugins/plugin/lang/nl/lang.php index d13e46ff8..0599c3184 100644 --- a/lib/plugins/plugin/lang/nl/lang.php +++ b/lib/plugins/plugin/lang/nl/lang.php @@ -12,6 +12,7 @@ * @author Marijn Hofstra * @author Timon Van Overveldt * @author Jeroen + * @author Ricardo Guijt */ $lang['menu'] = 'Plugins beheren'; $lang['download'] = 'Download en installeer een nieuwe plugin'; diff --git a/lib/plugins/popularity/lang/nl/lang.php b/lib/plugins/popularity/lang/nl/lang.php index 75c13013b..e5e94aab4 100644 --- a/lib/plugins/popularity/lang/nl/lang.php +++ b/lib/plugins/popularity/lang/nl/lang.php @@ -11,6 +11,7 @@ * @author Marijn Hofstra * @author Timon Van Overveldt * @author Jeroen + * @author Ricardo Guijt */ $lang['name'] = 'Populariteitsfeedback (kan even duren om in te laden)'; $lang['submit'] = 'Verstuur'; diff --git a/lib/plugins/revert/lang/nl/lang.php b/lib/plugins/revert/lang/nl/lang.php index 954bf1068..32e14c2c4 100644 --- a/lib/plugins/revert/lang/nl/lang.php +++ b/lib/plugins/revert/lang/nl/lang.php @@ -12,6 +12,7 @@ * @author Marijn Hofstra * @author Timon Van Overveldt * @author Jeroen + * @author Ricardo Guijt */ $lang['menu'] = 'Herstelmanager'; $lang['filter'] = 'Zoek naar bekladde pagina\'s'; diff --git a/lib/plugins/usermanager/lang/nl/lang.php b/lib/plugins/usermanager/lang/nl/lang.php index cac793386..b00ab22e0 100644 --- a/lib/plugins/usermanager/lang/nl/lang.php +++ b/lib/plugins/usermanager/lang/nl/lang.php @@ -12,6 +12,7 @@ * @author Marijn Hofstra * @author Timon Van Overveldt * @author Jeroen + * @author Ricardo Guijt */ $lang['menu'] = 'Gebruikersmanager'; $lang['noauth'] = '(gebruikersauthenticatie niet beschikbaar)'; -- cgit v1.2.3 From 4815d222f25c9a31949297223c98cfca7151ae8d Mon Sep 17 00:00:00 2001 From: Dominik Eckelmann Date: Thu, 8 Dec 2011 19:57:18 +0100 Subject: RemoteAPI can now handle remote calls. --- _test/cases/inc/remote.test.php | 102 ++++++++++++++++++++++++++++++++++++++++ inc/RemoteAPICore.php | 43 ++++++++++++++++- inc/remote.php | 68 +++++++++++++++++++-------- 3 files changed, 193 insertions(+), 20 deletions(-) diff --git a/_test/cases/inc/remote.test.php b/_test/cases/inc/remote.test.php index aa7a8cd1b..b33d8039f 100644 --- a/_test/cases/inc/remote.test.php +++ b/_test/cases/inc/remote.test.php @@ -1,9 +1,74 @@ array( + 'args' => array(), + 'return' => 'string', + 'doc' => 'Test method', + 'name' => 'stringTestMethod', + ), 'wiki.intTestMethod' => array( + 'args' => array(), + 'return' => 'int', + 'doc' => 'Test method', + 'name' => 'intTestMethod', + ), 'wiki.floatTestMethod' => array( + 'args' => array(), + 'return' => 'float', + 'doc' => 'Test method', + 'name' => 'floatTestMethod', + ), 'wiki.dateTestMethod' => array( + 'args' => array(), + 'return' => 'date', + 'doc' => 'Test method', + 'name' => 'dateTestMethod', + ), 'wiki.fileTestMethod' => array( + 'args' => array(), + 'return' => 'file', + 'doc' => 'Test method', + 'name' => 'fileTestMethod', + ), 'wiki.voidTestMethod' => array( + 'args' => array(), + 'return' => 'void', + 'doc' => 'Test method', + 'name' => 'voidTestMethod', + ), 'wiki.oneStringArgMethod' => array( + 'args' => array('string'), + 'return' => 'string', + 'doc' => 'Test method', + 'name' => 'oneStringArgMethod', + ), 'wiki.twoArgMethod' => array( + 'args' => array('string', 'int'), + 'return' => 'array', + 'doc' => 'Test method', + 'name' => 'twoArgMethod', + ), 'wiki.twoArgWithDefaultArg' => array( + 'args' => array('string', 'string'), + 'return' => 'string', + 'doc' => 'Test method', + 'name' => 'twoArgWithDefaultArg', + ), + ); + } + function stringTestMethod() { return 'success'; } + function intTestMethod() { return 42; } + function floatTestMethod() { return 3.14159265; } + function dateTestMethod() { return 2623452346; } + function fileTestMethod() { return 'file content'; } + function voidTestMethod() { return null; } + function oneStringArgMethod($arg) {return $arg; } + function twoArgMethod($string, $int) { return array($string, $int); } + function twoArgWithDefaultArg($string1, $string2 = 'default') { return array($string1, $string2); } + +} + class remote_plugin_testplugin extends DokuWiki_Remote_Plugin { function _getMethods() { return array( @@ -74,4 +139,41 @@ class remote_test extends UnitTestCase { $this->expectException('RemoteException'); $this->remote->forceAccess(); } + + function test_generalCoreFunctionWithoutArguments() { + global $conf; + $conf['remote'] = 1; + $remoteApi = new RemoteApi(); + $remoteApi->getCoreMethods(new RemoteAPICoreTest()); + + $this->assertEqual($remoteApi->call('wiki.stringTestMethod'), 'success'); + $this->assertEqual($remoteApi->call('wiki.intTestMethod'), 42); + $this->assertEqual($remoteApi->call('wiki.floatTestMethod'), 3.14159265); + $this->assertEqual($remoteApi->call('wiki.dateTestMethod'), 2623452346); + $this->assertEqual($remoteApi->call('wiki.fileTestMethod'), 'file content'); + $this->assertEqual($remoteApi->call('wiki.voidTestMethod'), null); + } + + function test_generalCoreFunctionOnArgumentMismatch() { + global $conf; + $conf['remote'] = 1; + $remoteApi = new RemoteApi(); + $remoteApi->getCoreMethods(new RemoteAPICoreTest()); + + $this->expectException('RemoteException'); + $remoteApi->call('wiki.voidTestMethod', array('something')); + } + + function test_generalCoreFunctionWithArguments() { + global $conf; + $conf['remote'] = 1; + + $remoteApi = new RemoteApi(); + $remoteApi->getCoreMethods(new RemoteAPICoreTest()); + + $this->assertEqual($remoteApi->call('wiki.oneStringArgMethod', array('string')), 'string'); + $this->assertEqual($remoteApi->call('wiki.twoArgMethod', array('string', 1)), array('string' , 1)); + $this->assertEqual($remoteApi->call('wiki.twoArgWithDefaultArg', array('string')), array('string', 'default')); + $this->assertEqual($remoteApi->call('wiki.twoArgWithDefaultArg', array('string', 'another')), array('string', 'another')); + } } diff --git a/inc/RemoteAPICore.php b/inc/RemoteAPICore.php index c4324ba29..a2e12c7f1 100644 --- a/inc/RemoteAPICore.php +++ b/inc/RemoteAPICore.php @@ -2,6 +2,47 @@ class RemoteAPICore { + function __getRemoteInfo() { + return array( + 'wiki.getPage' => array( + 'args' => array( + 'id' => array( + 'type' => 'string', + 'doc' => 'wiki page id' + ), + ), + 'return' => 'string', + 'doc' => 'Return a raw wiki page', + 'name' => 'rawPage', + ), + 'wiki.getPageVersion' => array( + 'args' => array( + 'id' => array( + 'type' => 'string', + 'doc' => 'wiki page id' + ), + 'rev' => array( + 'type' => 'int', + 'doc' => 'revision number of the page', + ), + ), + 'name' => 'rawPage', + 'return' => 'string', + 'doc' => 'Return a raw wiki page' + ), + 'wiki.getAttachment' => array( + 'args' => array( + 'type' => 'string', + 'doc' => 'file id', + ), + 'doc' => 'Return a media file', + 'return' => 'file', + 'name' => 'getAttachment', + ), + + ); + } + /** * Return a raw wiki page * @param string $id wiki page id @@ -58,7 +99,7 @@ class RemoteAPICore { $file = mediaFN($id); if ((auth_quickaclcheck(getNS($id).':*') >= AUTH_READ) && file_exists($file)){ - $info['lastModified'] = new IXR_Date(filemtime($file)); + $info['lastModified'] = filemtime($file); $info['size'] = filesize($file); } diff --git a/inc/remote.php b/inc/remote.php index 14f6614f1..5f136a43d 100644 --- a/inc/remote.php +++ b/inc/remote.php @@ -2,6 +2,9 @@ if (!defined('DOKU_INC')) die(); +class RemoteException extends Exception {} +class RemoteAccessDenied extends RemoteException {} + /** * This class provides information about remote access to the wiki. * @@ -13,11 +16,16 @@ if (!defined('DOKU_INC')) die(); * == Information structure == * The information about methods will be given in an array with the following structure: * array( - * 'method.name' => array( + * 'method.remoteName' => array( * 'args' => array( - * 'type' => 'string|int|...', + * 'name' => array( + * 'type' => 'string|int|...|date|file', + * ['doc' = 'argument documentation'], + * ), * ) - * 'return' => 'type' + * 'name' => 'method name in class', + * 'return' => 'type', +* ['doc' = 'method documentation'], * ) * ) * @@ -35,9 +43,9 @@ if (!defined('DOKU_INC')) die(); class RemoteAPI { /** - * @var array remote methods provided by dokuwiki. + * @var RemoteAPICore */ - private $coreMethods = array(); + private $coreMethods = null; /** * @var array remote methods provided by dokuwiki plugins - will be filled lazy via @@ -62,19 +70,36 @@ class RemoteAPI { * @param array $args arguments to pass to the given method * @return mixed result of method call, must be a primitive type. */ - public function call($method, $args) { + public function call($method, $args = array()) { $this->forceAccess(); - $method = explode('.', $method); - if ($method[0] === 'plugin') { - $plugin = plugin_load('remote', $method[1]); + list($type, $pluginName, $call) = explode('.', $method, 3); + if ($type === 'plugin') { + $plugin = plugin_load('remote', $pluginName); if (!$plugin) { - throw new RemoteException('Method unavailable'); + throw new RemoteException('Method dose not exists'); } - return call_user_func_array(array($plugin, $method[2]), $args); + return call_user_func_array(array($plugin, $call), $args); } else { - // TODO call core method + $coreMethods = $this->getCoreMethods(); + if (!isset($coreMethods[$method])) { + throw new RemoteException('Method dose not exists'); + } + $this->checkArgumentLength($coreMethods[$method], $args); + return call_user_func_array(array($this->coreMethods, $this->getMethodName($coreMethods, $method)), $args); } + } + private function checkArgumentLength($method, $args) { + if (count($method['args']) < count($args)) { + throw new RemoteException('Method dose not exists - wrong parameter count.'); + } + } + + private function getMethodName($methodMeta, $method) { + if (isset($methodMeta[$method]['name'])) { + return $methodMeta[$method]['name']; + } + return $method; } /** @@ -122,13 +147,18 @@ class RemoteAPI { } /** + * @param RemoteAPICore $apiCore this parameter is used for testing. Here you can pass a non-default RemoteAPICore + * instance. (for mocking) * @return array all core methods. */ - public function getCoreMethods() { - return $this->coreMethods; + public function getCoreMethods($apiCore = null) { + if ($this->coreMethods === null) { + if ($apiCore === null) { + $this->coreMethods = new RemoteAPICore(); + } else { + $this->coreMethods = $apiCore; + } + } + return $this->coreMethods->__getRemoteInfo(); } -} - - -class RemoteException extends Exception {} -class RemoteAccessDenied extends RemoteException {} \ No newline at end of file +} \ No newline at end of file -- cgit v1.2.3 From 647919c9a61d928502b0b45063cc60702d0d310e Mon Sep 17 00:00:00 2001 From: Dominik Eckelmann Date: Thu, 8 Dec 2011 20:33:30 +0100 Subject: added remote plugin calls. --- _test/cases/inc/remote.test.php | 43 +++++++++++++++++++++++++++++++++++++---- inc/remote.php | 7 +++++-- 2 files changed, 44 insertions(+), 6 deletions(-) diff --git a/_test/cases/inc/remote.test.php b/_test/cases/inc/remote.test.php index b33d8039f..f0e7b3d27 100644 --- a/_test/cases/inc/remote.test.php +++ b/_test/cases/inc/remote.test.php @@ -75,13 +75,24 @@ class remote_plugin_testplugin extends DokuWiki_Remote_Plugin { 'method1' => array( 'args' => array(), 'return' => 'void' - ), - 'method2' => array( + ), 'methodString' => array( + 'args' => array(), + 'return' => 'string' + ), 'method2' => array( + 'args' => array('string', 'int'), + 'return' => 'array', + 'name' => 'method2', + ), 'method2ext' => array( 'args' => array('string', 'int', 'bool'), - 'return' => array('string'), + 'return' => 'array', + 'name' => 'method2', ) ); } + + function method1() { return null; } + function methodString() { return 'success'; } + function method2($str, $int, $bool = false) { return array($str, $int, $bool); } } @@ -112,7 +123,11 @@ class remote_test extends UnitTestCase { function test_pluginMethods() { $methods = $this->remote->getPluginMethods(); - $this->assertEqual(array_keys($methods), array('plugin.testplugin.method1', 'plugin.testplugin.method2')); + $actual = array_keys($methods); + sort($actual); + $expect = array('plugin.testplugin.method1', 'plugin.testplugin.method2', 'plugin.testplugin.methodString', 'plugin.testplugin.method2ext'); + sort($expect); + $this->assertEqual($expect,$actual); } function test_hasAccessSuccess() { @@ -176,4 +191,24 @@ class remote_test extends UnitTestCase { $this->assertEqual($remoteApi->call('wiki.twoArgWithDefaultArg', array('string')), array('string', 'default')); $this->assertEqual($remoteApi->call('wiki.twoArgWithDefaultArg', array('string', 'another')), array('string', 'another')); } + + function test_pluginCallMethods() { + global $conf; + $conf['remote'] = 1; + + $remoteApi = new RemoteApi(); + $this->assertEqual($remoteApi->call('plugin.testplugin.method1'), null); + $this->assertEqual($remoteApi->call('plugin.testplugin.method2', array('string', 7)), array('string', 7, false)); + $this->assertEqual($remoteApi->call('plugin.testplugin.method2ext', array('string', 7, true)), array('string', 7, true)); + $this->assertEqual($remoteApi->call('plugin.testplugin.methodString'), 'success'); + } + + function test_notExistingCall() { + global $conf; + $conf['remote'] = 1; + + $remoteApi = new RemoteApi(); + $this->expectException('RemoteException'); + $remoteApi->call('dose not exist'); + } } diff --git a/inc/remote.php b/inc/remote.php index 5f136a43d..bc35d525e 100644 --- a/inc/remote.php +++ b/inc/remote.php @@ -75,10 +75,12 @@ class RemoteAPI { list($type, $pluginName, $call) = explode('.', $method, 3); if ($type === 'plugin') { $plugin = plugin_load('remote', $pluginName); + $methods = $this->getPluginMethods(); if (!$plugin) { throw new RemoteException('Method dose not exists'); } - return call_user_func_array(array($plugin, $call), $args); + $name = $this->getMethodName($methods, $method); + return call_user_func_array(array($plugin, $name), $args); } else { $coreMethods = $this->getCoreMethods(); if (!isset($coreMethods[$method])) { @@ -99,7 +101,8 @@ class RemoteAPI { if (isset($methodMeta[$method]['name'])) { return $methodMeta[$method]['name']; } - return $method; + $method = explode('.', $method); + return $method[count($method)-1]; } /** -- cgit v1.2.3 From 795114e73f18f06c2b32b433e150cad81da6581f Mon Sep 17 00:00:00 2001 From: Dominik Eckelmann Date: Sat, 10 Dec 2011 14:05:33 +0100 Subject: changed return types --- _test/cases/inc/remote.test.php | 8 ++++---- inc/remote.php | 15 +++++++++++++++ 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/_test/cases/inc/remote.test.php b/_test/cases/inc/remote.test.php index f0e7b3d27..23186344b 100644 --- a/_test/cases/inc/remote.test.php +++ b/_test/cases/inc/remote.test.php @@ -60,8 +60,8 @@ class RemoteAPICoreTest { function stringTestMethod() { return 'success'; } function intTestMethod() { return 42; } function floatTestMethod() { return 3.14159265; } - function dateTestMethod() { return 2623452346; } - function fileTestMethod() { return 'file content'; } + function dateTestMethod() { return new RemoteDate(2623452346); } + function fileTestMethod() { return new RemoteFile('file content'); } function voidTestMethod() { return null; } function oneStringArgMethod($arg) {return $arg; } function twoArgMethod($string, $int) { return array($string, $int); } @@ -164,8 +164,8 @@ class remote_test extends UnitTestCase { $this->assertEqual($remoteApi->call('wiki.stringTestMethod'), 'success'); $this->assertEqual($remoteApi->call('wiki.intTestMethod'), 42); $this->assertEqual($remoteApi->call('wiki.floatTestMethod'), 3.14159265); - $this->assertEqual($remoteApi->call('wiki.dateTestMethod'), 2623452346); - $this->assertEqual($remoteApi->call('wiki.fileTestMethod'), 'file content'); + $this->assertEqual($remoteApi->call('wiki.dateTestMethod'), new RemoteDate(2623452346)); + $this->assertEqual($remoteApi->call('wiki.fileTestMethod'), new RemoteFile('file content')); $this->assertEqual($remoteApi->call('wiki.voidTestMethod'), null); } diff --git a/inc/remote.php b/inc/remote.php index bc35d525e..7e82b6845 100644 --- a/inc/remote.php +++ b/inc/remote.php @@ -5,6 +5,21 @@ if (!defined('DOKU_INC')) die(); class RemoteException extends Exception {} class RemoteAccessDenied extends RemoteException {} +abstract class RemoteDataType { + private $value; + + function __construct($value) { + $this->value = $value; + } + + function getValue() { + return $this->value; + } +} + +class RemoteDate extends RemoteDataType {} +class RemoteFile extends RemoteDataType {} + /** * This class provides information about remote access to the wiki. * -- cgit v1.2.3 From 97a000f0551735b35606d94d59abc4ff440783a5 Mon Sep 17 00:00:00 2001 From: Tim Roes Date: Thu, 1 Dec 2011 22:33:16 +0100 Subject: Fixed bug in XML-RPC search. The score was randomly transfered as string or as integer. This way it will always be transfered as an integer. --- lib/exe/xmlrpc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/exe/xmlrpc.php b/lib/exe/xmlrpc.php index e5e3298ae..95775188f 100644 --- a/lib/exe/xmlrpc.php +++ b/lib/exe/xmlrpc.php @@ -411,7 +411,7 @@ class dokuwiki_xmlrpc_server extends IXR_IntrospectionServer { $pages[] = array( 'id' => $id, - 'score' => $score, + 'score' => intval($score), 'rev' => filemtime($file), 'mtime' => filemtime($file), 'size' => filesize($file), -- cgit v1.2.3 From 6201c7a865b1007b6a0e2a221b1c6fcdc738b772 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Sun, 11 Dec 2011 12:21:56 +0000 Subject: updated GPL2 license text (fixes whitespace issues and typos and updates FSF address) --- COPYING | 41 ++++++++++++++++++++--------------------- 1 file changed, 20 insertions(+), 21 deletions(-) diff --git a/COPYING b/COPYING index d60c31a97..d159169d1 100644 --- a/COPYING +++ b/COPYING @@ -1,12 +1,12 @@ - GNU GENERAL PUBLIC LICENSE - Version 2, June 1991 + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 - Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Copyright (C) 1989, 1991 Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. - Preamble + Preamble The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public @@ -15,7 +15,7 @@ software--to make sure the software is free for all its users. This General Public License applies to most of the Free Software Foundation's software and to any other program whose authors commit to using it. (Some other Free Software Foundation software is covered by -the GNU Library General Public License instead.) You can apply it to +the GNU Lesser General Public License instead.) You can apply it to your programs, too. When we speak of free software, we are referring to freedom, not @@ -55,8 +55,8 @@ patent must be licensed for everyone's free use or not licensed at all. The precise terms and conditions for copying, distribution and modification follow. - - GNU GENERAL PUBLIC LICENSE + + GNU GENERAL PUBLIC LICENSE TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION 0. This License applies to any program or other work which contains @@ -110,7 +110,7 @@ above, provided that you also meet all of these conditions: License. (Exception: if the Program itself is interactive but does not normally print such an announcement, your work based on the Program is not required to print an announcement.) - + These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Program, and can be reasonably considered independent and separate works in @@ -168,7 +168,7 @@ access to copy from a designated place, then offering equivalent access to copy the source code from the same place counts as distribution of the source code, even though third parties are not compelled to copy the source along with the object code. - + 4. You may not copy, modify, sublicense, or distribute the Program except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense or distribute the Program is @@ -225,7 +225,7 @@ impose that choice. This section is intended to make thoroughly clear what is believed to be a consequence of the rest of this License. - + 8. If the distribution and/or use of the Program is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Program under this License @@ -255,7 +255,7 @@ make exceptions for this. Our decision will be guided by the two goals of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally. - NO WARRANTY + NO WARRANTY 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN @@ -277,9 +277,9 @@ YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs If you develop a new program, and you want it to be of the greatest possible use to the public, the best way to achieve this is to make it @@ -303,17 +303,16 @@ the "copyright" line and a pointer to where the full notice is found. MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. Also add information on how to contact you by electronic and paper mail. If the program is interactive, make it output a short notice like this when it starts in an interactive mode: - Gnomovision version 69, Copyright (C) year name of author + Gnomovision version 69, Copyright (C) year name of author Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. @@ -336,5 +335,5 @@ necessary. Here is a sample; alter the names: This General Public License does not permit incorporating your program into proprietary programs. If your program is a subroutine library, you may consider it more useful to permit linking proprietary applications with the -library. If this is what you want to do, use the GNU Library General +library. If this is what you want to do, use the GNU Lesser General Public License instead of this License. -- cgit v1.2.3 From add86630b09f0e91952081112e3fa642ee35e499 Mon Sep 17 00:00:00 2001 From: Dominik Eckelmann Date: Mon, 12 Dec 2011 17:02:12 +0100 Subject: changed to new Remote Data objects --- inc/RemoteAPICore.php | 27 ++++++++++----------------- 1 file changed, 10 insertions(+), 17 deletions(-) diff --git a/inc/RemoteAPICore.php b/inc/RemoteAPICore.php index a2e12c7f1..6b34d257a 100644 --- a/inc/RemoteAPICore.php +++ b/inc/RemoteAPICore.php @@ -81,8 +81,7 @@ class RemoteAPICore { } $data = io_readFile($file, false); - $base64 = base64_encode($data); - return $base64; + return new RemoteFile($data); } /** @@ -134,7 +133,7 @@ class RemoteAPICore { $page['id'] = trim($pages[$idx]); $page['perms'] = $perm; $page['size'] = @filesize(wikiFN($pages[$idx])); - $page['lastModified'] = new IXR_Date(@filemtime(wikiFN($pages[$idx]))); + $page['lastModified'] = new RemoteDate(@filemtime(wikiFN($pages[$idx]))); $list[] = $page; } @@ -181,7 +180,7 @@ class RemoteAPICore { $pages[] = array( 'id' => $id, - 'score' => $score, + 'score' => intval($score), 'rev' => filemtime($file), 'mtime' => filemtime($file), 'size' => filesize($file), @@ -210,7 +209,6 @@ class RemoteAPICore { */ function listAttachments($ns, $options = array()) { global $conf; - global $lang; $ns = cleanID($ns); @@ -228,7 +226,7 @@ class RemoteAPICore { for($i=0; $i<$len; $i++) { unset($data[$i]['meta']); - $data[$i]['lastModified'] = new IXR_Date($data[$i]['mtime']); + $data[$i]['lastModified'] = new RemoteDate($data[$i]['mtime']); } return $data; } else { @@ -261,7 +259,7 @@ class RemoteAPICore { $data = array( 'name' => $id, - 'lastModified' => new IXR_Date($time), + 'lastModified' => new RemoteDate($time), 'author' => (($info['user']) ? $info['user'] : $info['ip']), 'version' => $time ); @@ -344,7 +342,7 @@ class RemoteAPICore { * * Michael Klier */ - function putAttachment($id, $file, $params) { + function putAttachment($id, RemoteFile $file, $params) { $id = cleanID($id); $auth = auth_quickaclcheck(getNS($id).':*'); @@ -358,12 +356,7 @@ class RemoteAPICore { // save temporary file @unlink($ftmp); - if (preg_match('/^[A-Za-z0-9\+\/]*={0,2}$/', $file) === 1) { - // DEPRECATED: Double-decode file if it still looks like base64 - // after first decoding (which is done by the library) - $file = base64_decode($file); - } - io_saveFile($ftmp, $file); + io_saveFile($ftmp, $file->getValue()); $res = media_save(array('name' => $ftmp), $id, $params['ow'], $auth, 'rename'); if (is_array($res)) { @@ -468,7 +461,7 @@ class RemoteAPICore { foreach ($recents as $recent) { $change = array(); $change['name'] = $recent['id']; - $change['lastModified'] = new IXR_Date($recent['date']); + $change['lastModified'] = new RemoteDate($recent['date']); $change['author'] = $recent['user']; $change['version'] = $recent['date']; $change['perms'] = $recent['perms']; @@ -501,7 +494,7 @@ class RemoteAPICore { foreach ($recents as $recent) { $change = array(); $change['name'] = $recent['id']; - $change['lastModified'] = new IXR_Date($recent['date']); + $change['lastModified'] = new RemoteDate($recent['date']); $change['author'] = $recent['user']; $change['version'] = $recent['date']; $change['perms'] = $recent['perms']; @@ -565,7 +558,7 @@ class RemoteAPICore { $data['ip'] = $info['ip']; $data['type'] = $info['type']; $data['sum'] = $info['sum']; - $data['modified'] = new IXR_Date($info['date']); + $data['modified'] = new RemoteDate($info['date']); $data['version'] = $info['date']; array_push($versions, $data); } -- cgit v1.2.3 From 2e0ce43774bc165c88e07cd1eab502a22ebfa2ae Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Tue, 13 Dec 2011 15:18:29 +0100 Subject: Avoid a warning when a media cachefile doesn't exist yet --- inc/media.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/inc/media.php b/inc/media.php index e71bfd236..93692a7c6 100644 --- a/inc/media.php +++ b/inc/media.php @@ -1778,7 +1778,7 @@ function media_crop_image($file, $ext, $w, $h=0){ $local = getCacheName($file,'.media.'.$cw.'x'.$ch.'.crop.'.$ext); $mtime = @filemtime($local); // 0 if not exists - if( $mtime > filemtime($file) || + if( $mtime > @filemtime($file) || media_crop_imageIM($ext,$file,$info[0],$info[1],$local,$cw,$ch,$cx,$cy) || media_resize_imageGD($ext,$file,$cw,$ch,$local,$cw,$ch,$cx,$cy) ){ if($conf['fperm']) chmod($local, $conf['fperm']); -- cgit v1.2.3 From 965d96926bd3b834e7814174763a94560f8bc2f0 Mon Sep 17 00:00:00 2001 From: Begina Felicysym Date: Wed, 14 Dec 2011 21:47:28 +0100 Subject: Polish language update --- inc/lang/pl/lang.php | 45 +++++++++++++++++++++++++++++++- lib/plugins/acl/lang/pl/lang.php | 1 + lib/plugins/config/lang/pl/lang.php | 7 ++++- lib/plugins/plugin/lang/pl/lang.php | 2 ++ lib/plugins/popularity/lang/pl/lang.php | 1 + lib/plugins/revert/lang/pl/lang.php | 1 + lib/plugins/usermanager/lang/pl/lang.php | 1 + 7 files changed, 56 insertions(+), 2 deletions(-) diff --git a/inc/lang/pl/lang.php b/inc/lang/pl/lang.php index a6fc3d52e..98536033c 100644 --- a/inc/lang/pl/lang.php +++ b/inc/lang/pl/lang.php @@ -12,6 +12,7 @@ * @author maros * @author Grzegorz Widła * @author Łukasz Chmaj + * @author Begina Felicysym */ $lang['encoding'] = 'utf-8'; $lang['direction'] = 'ltr'; @@ -53,6 +54,8 @@ $lang['btn_recover'] = 'Przywróć szkic'; $lang['btn_draftdel'] = 'Usuń szkic'; $lang['btn_revert'] = 'Przywróć'; $lang['btn_register'] = 'Zarejestruj się!'; +$lang['btn_apply'] = 'Zastosuj'; +$lang['btn_media'] = 'Menadżer multimediów'; $lang['loggedinas'] = 'Zalogowany jako'; $lang['user'] = 'Użytkownik'; $lang['pass'] = 'Hasło'; @@ -97,7 +100,7 @@ $lang['txt_filename'] = 'Nazwa pliku (opcjonalnie)'; $lang['txt_overwrt'] = 'Nadpisać istniejący plik?'; $lang['lockedby'] = 'Aktualnie zablokowane przez'; $lang['lockexpire'] = 'Blokada wygasa'; -$lang['willexpire'] = 'Za minutę Twoja blokada tej strony wygaśnie.\nW celu uniknięcia konfliktów wyświetl podgląd aby odnowić blokadę.'; +$lang['js']['willexpire'] = 'Twoja blokada edycji tej strony wygaśnie w ciągu minuty. \nW celu uniknięcia konfliktów użyj przycisku podglądu aby odnowić blokadę.'; $lang['js']['notsavedyet'] = 'Nie zapisane zmiany zostaną utracone. Czy na pewno kontynuować?'; $lang['js']['searchmedia'] = 'Szukaj plików'; @@ -129,6 +132,15 @@ Możesz skopiować odnośnik.'; $lang['js']['linkwiz'] = 'Tworzenie odnośników'; $lang['js']['linkto'] = 'Link do'; $lang['js']['del_confirm'] = 'Czy na pewno usunąć?'; +$lang['js']['restore_confirm'] = 'Naprawdę przywrócić tą wersję?'; +$lang['js']['media_diff'] = 'Pokaż różnice:'; +$lang['js']['media_diff_both'] = 'Obok siebie'; +$lang['js']['media_select'] = 'Wybierz pliki...'; +$lang['js']['media_upload_btn'] = 'Przesłanie plików'; +$lang['js']['media_done_btn'] = 'Zrobione'; +$lang['js']['media_drop'] = 'Upuść tutaj pliki do przesłania'; +$lang['js']['media_cancel'] = 'usuń'; +$lang['js']['media_overwrt'] = 'Nadpisz istniejące pliki'; $lang['rssfailed'] = 'Wystąpił błąd przy pobieraniu tych danych: '; $lang['nothingfound'] = 'Nic nie znaleziono.'; $lang['mediaselect'] = 'Wysyłanie pliku'; @@ -183,6 +195,10 @@ $lang['mail_changed'] = 'Strona zmieniona:'; $lang['mail_subscribe_list'] = 'Zmienione strony w katalogu:'; $lang['mail_new_user'] = 'Nowy użytkownik:'; $lang['mail_upload'] = 'Umieszczono plik:'; +$lang['changes_type'] = 'Zobacz zmiany'; +$lang['pages_changes'] = 'Strony'; +$lang['media_changes'] = 'Pliki multimediów'; +$lang['both_changes'] = 'Zarówno strony jak i pliki multimediów'; $lang['qb_bold'] = 'Pogrubienie'; $lang['qb_italic'] = 'Pochylenie'; $lang['qb_underl'] = 'Podkreślenie'; @@ -223,6 +239,9 @@ $lang['img_copyr'] = 'Prawa autorskie'; $lang['img_format'] = 'Format'; $lang['img_camera'] = 'Aparat'; $lang['img_keywords'] = 'Słowa kluczowe'; +$lang['img_width'] = 'Szerokość'; +$lang['img_height'] = 'Wysokość'; +$lang['img_manager'] = 'Zobacz w menadżerze multimediów'; $lang['subscr_subscribe_success'] = 'Dodano %s do listy subskrypcji %s'; $lang['subscr_subscribe_error'] = 'Błąd podczas dodawania %s do listy subskrypcji %s'; $lang['subscr_subscribe_noaddress'] = 'Brak adresu skojarzonego z twoim loginem, nie możesz zostać dodany(a) do listy subskrypcji'; @@ -288,3 +307,27 @@ $lang['hours'] = '%d godzin temu'; $lang['minutes'] = '%d minut temu'; $lang['seconds'] = '%d sekund temu'; $lang['wordblock'] = 'Twoje ustawienia nie zostały zapisane ponieważ zawierają niedozwoloną treść (spam).'; +$lang['media_uploadtab'] = 'Przesyłanie plików'; +$lang['media_searchtab'] = 'Szukaj'; +$lang['media_file'] = 'Plik'; +$lang['media_viewtab'] = 'Widok'; +$lang['media_edittab'] = 'Zmiana'; +$lang['media_historytab'] = 'Historia'; +$lang['media_list_thumbs'] = 'Miniatury'; +$lang['media_list_rows'] = 'Wiersze'; +$lang['media_sort_name'] = 'Nazwa'; +$lang['media_sort_date'] = 'Data'; +$lang['media_namespaces'] = 'Wybierz przestrzeń nazw'; +$lang['media_files'] = 'Pliki w %s'; +$lang['media_upload'] = 'Przesyłanie plików na %s'; +$lang['media_search'] = 'Znajdź w %s'; +$lang['media_view'] = '%s'; +$lang['media_viewold'] = '%s na %s'; +$lang['media_edit'] = 'Zmień %s'; +$lang['media_history'] = 'Historia dla %s'; +$lang['media_meta_edited'] = 'zmienione metadane'; +$lang['media_perm_read'] = 'Przepraszamy, nie masz wystarczających uprawnień do odczytu plików.'; +$lang['media_perm_upload'] = 'Przepraszamy, nie masz wystarczających uprawnień do przesyłania plików.'; +$lang['media_update'] = 'Prześlij nową wersję'; +$lang['media_restore'] = 'Odtwórz tą wersję'; +$lang['plugin_install_err'] = 'Wtyczka zainstalowana nieprawidłowo. Zmień nazwę katalogu wtyczki \'%s\' na \'%s\'.'; diff --git a/lib/plugins/acl/lang/pl/lang.php b/lib/plugins/acl/lang/pl/lang.php index a72b6af11..1b10b5232 100644 --- a/lib/plugins/acl/lang/pl/lang.php +++ b/lib/plugins/acl/lang/pl/lang.php @@ -12,6 +12,7 @@ * @author maros * @author Grzegorz Widła * @author Łukasz Chmaj + * @author Begina Felicysym */ $lang['admin_acl'] = 'Zarządzanie uprawnieniami'; $lang['acl_group'] = 'Grupa'; diff --git a/lib/plugins/config/lang/pl/lang.php b/lib/plugins/config/lang/pl/lang.php index 6e94a2e3d..62c55d328 100644 --- a/lib/plugins/config/lang/pl/lang.php +++ b/lib/plugins/config/lang/pl/lang.php @@ -13,6 +13,7 @@ * @author maros * @author Grzegorz Widła * @author Łukasz Chmaj + * @author Begina Felicysym */ $lang['menu'] = 'Ustawienia'; $lang['error'] = 'Ustawienia nie zostały zapisane z powodu błędnych wartości, przejrzyj je i ponów próbę zapisu.
Niepoprawne wartości są wyróżnione kolorem czerwonym.'; @@ -47,6 +48,7 @@ $lang['lang'] = 'Język'; $lang['basedir'] = 'Katalog główny'; $lang['baseurl'] = 'Główny URL'; $lang['savedir'] = 'Katalog z danymi'; +$lang['cookiedir'] = 'Ścieżka plików ciasteczek. Zostaw puste by użyć baseurl.'; $lang['start'] = 'Tytuł strony początkowej'; $lang['title'] = 'Tytuł wiki'; $lang['template'] = 'Motyw'; @@ -70,6 +72,7 @@ $lang['useheading'] = 'Pierwszy nagłówek jako tytuł'; $lang['refcheck'] = 'Sprawdzanie odwołań przed usunięciem pliku'; $lang['refshow'] = 'Ilość pokazywanych odwołań do pliku'; $lang['allowdebug'] = 'Debugowanie (niebezpieczne!)'; +$lang['mediarevisions'] = 'Włączyć wersjonowanie multimediów?'; $lang['usewordblock'] = 'Blokowanie spamu na podstawie słów'; $lang['indexdelay'] = 'Okres indeksowania w sekundach'; $lang['relnofollow'] = 'Nagłówek rel="nofollow" dla odnośników zewnętrznych'; @@ -109,13 +112,15 @@ $lang['fetchsize'] = 'Maksymalny rozmiar pliku (w bajtach) jaki moż $lang['notify'] = 'Wysyłanie powiadomień na adres e-mail'; $lang['registernotify'] = 'Prześlij informacje o nowych użytkownikach na adres e-mail'; $lang['mailfrom'] = 'Adres e-mail tego wiki'; -$lang['gzip_output'] = 'Używaj GZIP dla XHTML'; +$lang['mailprefix'] = 'Prefiks tematu e-mail do automatycznych wiadomości'; +$lang['gzip_output'] = 'Używaj kodowania GZIP dla zawartości XHTML'; $lang['gdlib'] = 'Wersja biblioteki GDLib'; $lang['im_convert'] = 'Ścieżka do programu imagemagick'; $lang['jpg_quality'] = 'Jakość kompresji JPG (0-100)'; $lang['subscribers'] = 'Subskrypcja'; $lang['subscribe_time'] = 'Czas po którym są wysyłane listy subskrypcji i streszczenia (sek.); Powinna być to wartość większa niż podana w zmiennej recent_days.'; $lang['compress'] = 'Kompresja arkuszy CSS i plików JavaScript'; +$lang['cssdatauri'] = 'Rozmiar w bajtach, poniżej którego odwołania do obrazów w plikach CSS powinny być osadzone bezpośrednio w arkuszu stylów by zmniejszyć ogólne żądania nagłówków HTTP. Technika ta nie działa w IE 7 i poniżej! 400 do 600 bajtów jest dobrą wartością. Ustaw 0 aby wyłączyć.'; $lang['hidepages'] = 'Ukrywanie stron pasujących do wzorca (wyrażenie regularne)'; $lang['send404'] = 'Nagłówek "HTTP 404/Page Not Found" dla nieistniejących stron'; $lang['sitemap'] = 'Okres generowania Google Sitemap (w dniach)'; diff --git a/lib/plugins/plugin/lang/pl/lang.php b/lib/plugins/plugin/lang/pl/lang.php index a84c55190..02459f1de 100644 --- a/lib/plugins/plugin/lang/pl/lang.php +++ b/lib/plugins/plugin/lang/pl/lang.php @@ -13,6 +13,7 @@ * @author maros * @author Grzegorz Widła * @author Łukasz Chmaj + * @author Begina Felicysym */ $lang['menu'] = 'Menadżer wtyczek'; $lang['download'] = 'Ściągnij i zainstaluj nową wtyczkę'; @@ -58,3 +59,4 @@ $lang['enabled'] = 'Wtyczka %s włączona.'; $lang['notenabled'] = 'Nie udało się uruchomić wtyczki %s, sprawdź uprawnienia dostępu do plików.'; $lang['disabled'] = 'Wtyczka %s wyłączona.'; $lang['notdisabled'] = 'Nie udało się wyłączyć wtyczki %s, sprawdź uprawnienia dostępu do plików.'; +$lang['packageinstalled'] = 'Pakiet wtyczek (%d wtyczki:% s) zainstalowany pomyślnie.'; diff --git a/lib/plugins/popularity/lang/pl/lang.php b/lib/plugins/popularity/lang/pl/lang.php index d96254fd8..64d772d54 100644 --- a/lib/plugins/popularity/lang/pl/lang.php +++ b/lib/plugins/popularity/lang/pl/lang.php @@ -11,6 +11,7 @@ * @author maros * @author Grzegorz Widła * @author Łukasz Chmaj + * @author Begina Felicysym */ $lang['name'] = 'Informacja o popularności (ładowanie może zająć dłuższą chwilę)'; $lang['submit'] = 'Wyślij dane'; diff --git a/lib/plugins/revert/lang/pl/lang.php b/lib/plugins/revert/lang/pl/lang.php index f36dc591a..30ab60fda 100644 --- a/lib/plugins/revert/lang/pl/lang.php +++ b/lib/plugins/revert/lang/pl/lang.php @@ -10,6 +10,7 @@ * @author maros * @author Grzegorz Widła * @author Łukasz Chmaj + * @author Begina Felicysym */ $lang['menu'] = 'Menadżer przywracania'; $lang['filter'] = 'Wyszukaj uszkodzone strony'; diff --git a/lib/plugins/usermanager/lang/pl/lang.php b/lib/plugins/usermanager/lang/pl/lang.php index 7c79c5d1f..5bbf84370 100644 --- a/lib/plugins/usermanager/lang/pl/lang.php +++ b/lib/plugins/usermanager/lang/pl/lang.php @@ -11,6 +11,7 @@ * @author maros * @author Grzegorz Widła * @author Łukasz Chmaj + * @author Begina Felicysym */ $lang['menu'] = 'Menadżer użytkowników'; $lang['noauth'] = '(uwierzytelnienie użytkownika niemożliwe)'; -- cgit v1.2.3 From d0674b61febbf2449c8a5fdddff35d4ed55147af Mon Sep 17 00:00:00 2001 From: Jian Wei Tay Date: Thu, 15 Dec 2011 22:09:28 +0100 Subject: Malay language update --- inc/lang/ms/lang.php | 97 ++++++++++++++++++++++++++++++++ lib/plugins/acl/lang/ms/lang.php | 6 ++ lib/plugins/config/lang/ms/lang.php | 6 ++ lib/plugins/plugin/lang/ms/lang.php | 6 ++ lib/plugins/popularity/lang/ms/lang.php | 6 ++ lib/plugins/revert/lang/ms/lang.php | 6 ++ lib/plugins/usermanager/lang/ms/lang.php | 6 ++ 7 files changed, 133 insertions(+) create mode 100644 inc/lang/ms/lang.php create mode 100644 lib/plugins/acl/lang/ms/lang.php create mode 100644 lib/plugins/config/lang/ms/lang.php create mode 100644 lib/plugins/plugin/lang/ms/lang.php create mode 100644 lib/plugins/popularity/lang/ms/lang.php create mode 100644 lib/plugins/revert/lang/ms/lang.php create mode 100644 lib/plugins/usermanager/lang/ms/lang.php diff --git a/inc/lang/ms/lang.php b/inc/lang/ms/lang.php new file mode 100644 index 000000000..92dc86b5a --- /dev/null +++ b/inc/lang/ms/lang.php @@ -0,0 +1,97 @@ +>'; +$lang['btn_revs'] = 'Sejarah'; +$lang['btn_recent'] = 'Perubahan Terkini'; +$lang['btn_upload'] = 'Unggah (upload)'; +$lang['btn_cancel'] = 'Batal'; +$lang['btn_secedit'] = 'Sunting'; +$lang['btn_login'] = 'Masuk'; +$lang['btn_logout'] = 'Keluar'; +$lang['btn_admin'] = 'Admin'; +$lang['btn_update'] = 'Kemaskini'; +$lang['btn_delete'] = 'Hapus'; +$lang['btn_back'] = 'Balik'; +$lang['btn_backlink'] = 'Pautan ke halaman ini'; +$lang['btn_backtomedia'] = 'Balik ke rangkaian pilihan fail media'; +$lang['btn_subscribe'] = 'Pantau'; +$lang['btn_profile'] = 'Kemaskinikan profil'; +$lang['btn_reset'] = 'Batalkan suntingan'; +$lang['btn_resendpwd'] = 'Emel kata laluan baru'; +$lang['btn_draft'] = 'Sunting draf'; +$lang['btn_recover'] = 'Pulihkan draf'; +$lang['btn_draftdel'] = 'Hapuskan draf'; +$lang['btn_revert'] = 'Pulihkan'; +$lang['btn_register'] = 'Daftaran'; +$lang['btn_apply'] = 'Simpan'; +$lang['btn_media'] = 'Manager media'; +$lang['loggedinas'] = 'Log masuk sebagai'; +$lang['user'] = 'Nama pengguna'; +$lang['pass'] = 'Kata laluan'; +$lang['newpass'] = 'Kata laluan baru'; +$lang['oldpass'] = 'Kata laluan lama'; +$lang['passchk'] = 'sekali lagi'; +$lang['remember'] = 'Sentiasa ingati kata laluan saya.'; +$lang['fullname'] = 'Nama sebenar'; +$lang['email'] = 'E-mel'; +$lang['profile'] = 'Profil pengguna'; +$lang['badlogin'] = 'Maaf, ralat log masuk. Nama pengguna atau kata laluan salah.'; +$lang['minoredit'] = 'Suntingan Kecil'; +$lang['draftdate'] = 'Draf automatik disimpan pada'; +$lang['nosecedit'] = 'Halaman ini telah bertukar pada waktu sementara dan info bahagian ini telah luput. Seluruh halaman telah disarat.'; +$lang['regmissing'] = 'Maaf, semua medan mesti diisi'; +$lang['reguexists'] = 'Maaf, nama pengguna yang dimasukkan telah diguna. Sila pilih nama yang lain.'; +$lang['regsuccess'] = 'Akaun pengguna telah dicipta dan kata laluan telah dikirim kepada e-mel anda.'; +$lang['regsuccess2'] = 'Akaun pegguna telah dicipta.'; +$lang['regbadmail'] = 'Format alamat e-mel tidak sah. Sila masukkan semula ataupun kosongkan sahaja medan tersebut.'; +$lang['regbadpass'] = 'Kedua-dua kata laluan tidak sama. Sila masukkan semula.'; +$lang['regpwmail'] = 'Kata laluan Dokuwiki anda'; +$lang['reghere'] = 'Belum mendaftar akaun? Dapat akaun baru'; +$lang['profna'] = 'Wiki ini tidak menyokong modifikasi profil'; +$lang['profnoempty'] = 'Medan nama pengguna atau e-mel yang kosong tidak dibenarkan.'; +$lang['profchanged'] = 'Profil pengguna telah dikemaskini.'; +$lang['pwdforget'] = 'Terlupa kata laluan? Dapatkan yang baru'; +$lang['resendpwd'] = 'Kirimkan kata laluan baru untuk'; +$lang['resendpwdmissing'] = 'Maaf, semua medan perlu diisi.'; +$lang['resendpwdnouser'] = 'Maaf, nama pengguna ini tidak dapat dicari dalam database kami.'; +$lang['resendpwdbadauth'] = 'Maaf, kod authorasi ini tidak sah. Semak bahawa anda telah menggunakan seluruh pautan pengesahan yang dikirim.'; +$lang['resendpwdconfirm'] = 'Pautan pengesahan telah dikirimkan ke e-mel anda.'; +$lang['resendpwdsuccess'] = 'Kata laluan baru telah dikirimkan ke e-mel anda.'; +$lang['license'] = 'Selain daripada yang dinyata, isi wiki ini disediakan dengan lesen berikut:'; +$lang['licenseok'] = 'Perhatian: Dengan menyunting halaman ini, anda setuju untuk isi-isi anda dilesen menggunakan lesen berikut:'; +$lang['searchmedia'] = 'Cari nama fail:'; +$lang['searchmedia_in'] = 'Cari di %s'; +$lang['txt_upload'] = 'Pilih fail untuk diunggah'; +$lang['txt_filename'] = 'Unggah fail dengan nama (tidak wajib)'; +$lang['txt_overwrt'] = 'Timpa fail sekarang'; +$lang['lockedby'] = 'Halaman ini telah di'; +$lang['fileupload'] = 'Muat naik fail'; +$lang['uploadsucc'] = 'Pemuatan naik berjaya'; +$lang['uploadfail'] = 'Ralat muat naik'; +$lang['uploadxss'] = 'Fail ini mengandungi kod HTML atau kod skrip yang mungkin boleh disalah tafsir oleh pelayar web.'; +$lang['toc'] = 'Jadual Kandungan'; +$lang['current'] = 'kini'; +$lang['restored'] = 'Telah dikembalikan ke semakan sebelumnya'; +$lang['summary'] = 'Paparan'; diff --git a/lib/plugins/acl/lang/ms/lang.php b/lib/plugins/acl/lang/ms/lang.php new file mode 100644 index 000000000..77ad2a1c1 --- /dev/null +++ b/lib/plugins/acl/lang/ms/lang.php @@ -0,0 +1,6 @@ + Date: Sat, 17 Dec 2011 13:17:44 +0800 Subject: Rewark for missing commit 9aa0e6c6087e616511fc95d1650ca9b608edece8 --- inc/parser/xhtml.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/inc/parser/xhtml.php b/inc/parser/xhtml.php index ea1756803..a9ee33e9d 100644 --- a/inc/parser/xhtml.php +++ b/inc/parser/xhtml.php @@ -29,7 +29,7 @@ class Doku_Renderer_xhtml extends Doku_Renderer { var $doc = ''; // will contain the whole document var $toc = array(); // will contain the Table of Contents - private $sectionedits = array(); // A stack of section edit data + var $sectionedits = array(); // A stack of section edit data var $headers = array(); var $footnotes = array(); -- cgit v1.2.3 From 85038eabd994f3b7609fee54bfbaab2513f28c1e Mon Sep 17 00:00:00 2001 From: Danny Date: Sat, 17 Dec 2011 13:18:12 +0800 Subject: Rework for missing commit 08162f005f3ced0555de590dc1a53155af99d998 --- inc/parser/metadata.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/inc/parser/metadata.php b/inc/parser/metadata.php index 136c37531..bd396e2b4 100644 --- a/inc/parser/metadata.php +++ b/inc/parser/metadata.php @@ -455,16 +455,16 @@ class Doku_Renderer_metadata extends Doku_Renderer { global $conf; $isImage = false; - if (is_null($title)){ + if (is_array($title)){ + if($title['title']) return '['.$title['title'].']'; + } else if (is_null($title) || trim($title)==''){ if (useHeading('content') && $id){ - $heading = p_get_first_heading($id,METADATA_DONT_RENDER); + $heading = p_get_first_heading($id,false); if ($heading) return $heading; } return $default; - } else if (is_string($title)){ + } else { return $title; - } else if (is_array($title)){ - if($title['title']) return '['.$title['title'].']'; } } -- cgit v1.2.3 From f01b3e16cda640fb4b47ec254b8390970da0b806 Mon Sep 17 00:00:00 2001 From: Danny Date: Sat, 17 Dec 2011 13:32:44 +0800 Subject: Slight fix to match current version. --- inc/parser/metadata.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/inc/parser/metadata.php b/inc/parser/metadata.php index bd396e2b4..9b4c6b8da 100644 --- a/inc/parser/metadata.php +++ b/inc/parser/metadata.php @@ -459,7 +459,7 @@ class Doku_Renderer_metadata extends Doku_Renderer { if($title['title']) return '['.$title['title'].']'; } else if (is_null($title) || trim($title)==''){ if (useHeading('content') && $id){ - $heading = p_get_first_heading($id,false); + $heading = p_get_first_heading($id,METADATA_DONT_RENDER)); if ($heading) return $heading; } return $default; -- cgit v1.2.3 From 370d3435fb6b3a339465bb90b79ea9c275c0cbf9 Mon Sep 17 00:00:00 2001 From: Adrian Lang Date: Sun, 18 Dec 2011 18:58:27 +0100 Subject: Fix double URL-encoding in media manager (FS#2403) --- inc/media.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/inc/media.php b/inc/media.php index 93692a7c6..af4647ecb 100644 --- a/inc/media.php +++ b/inc/media.php @@ -1674,7 +1674,7 @@ function media_nstree_item($item){ $ret = ''; if (!($_REQUEST['do'] == 'media')) $ret .= ''; - else $ret .= ' idfilter($item['id'], false), 'tab_files' => 'files')) .'" class="idx_dir">'; $ret .= $item['label']; $ret .= ''; -- cgit v1.2.3 From df959702e1899c968dc953855f36b9788afa12d3 Mon Sep 17 00:00:00 2001 From: Adrian Lang Date: Tue, 20 Dec 2011 11:10:20 +0100 Subject: Revert 4a24b459, thus fixing FETCH_MEDIA_STATUS for missing files (FS#2405) --- inc/parser/xhtml.php | 1 - 1 file changed, 1 deletion(-) diff --git a/inc/parser/xhtml.php b/inc/parser/xhtml.php index ea1756803..bfa22d066 100644 --- a/inc/parser/xhtml.php +++ b/inc/parser/xhtml.php @@ -807,7 +807,6 @@ class Doku_Renderer_xhtml extends Doku_Renderer { //markup non existing files if (!$exists) { $link['class'] .= ' wikilink2'; - $link['url'] = media_managerURL(array('tab_details' => 'view', 'image' => $src, 'ns' => getNS($src)), '&'); } //output formatted -- cgit v1.2.3 From 48d7b7a6544f9cecba4b776c782a3891b28fb300 Mon Sep 17 00:00:00 2001 From: Dominik Eckelmann Date: Tue, 20 Dec 2011 13:50:37 +0100 Subject: use in_array to filter groups instead of preg_grep for acl the usage of preg_grep can result in "regular expression is too large" warnings, which leads to errors in auth_aclcheck. --- inc/auth.php | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/inc/auth.php b/inc/auth.php index e0f58e5f2..941dcb8d6 100644 --- a/inc/auth.php +++ b/inc/auth.php @@ -523,18 +523,19 @@ function auth_aclcheck($id,$user,$groups){ $groups[] = '@ALL'; //add User if($user) $groups[] = $user; - //build regexp - $regexp = join('|',$groups); }else{ - $regexp = '@ALL'; + $groups[] = '@ALL'; } //check exact match first - $matches = preg_grep('/^'.preg_quote($id,'/').'\s+('.$regexp.')\s+/'.$ci,$AUTH_ACL); + $matches = preg_grep('/^'.preg_quote($id,'/').'\s+(\S+)\s+/'.$ci,$AUTH_ACL); if(count($matches)){ foreach($matches as $match){ $match = preg_replace('/#.*$/','',$match); //ignore comments $acl = preg_split('/\s+/',$match); + if (!in_array($acl[1], $groups)) { + continue; + } if($acl[2] > AUTH_DELETE) $acl[2] = AUTH_DELETE; //no admins in the ACL! if($acl[2] > $perm){ $perm = $acl[2]; @@ -554,20 +555,24 @@ function auth_aclcheck($id,$user,$groups){ } do{ - $matches = preg_grep('/^'.preg_quote($path,'/').'\s+('.$regexp.')\s+/'.$ci,$AUTH_ACL); + $matches = preg_grep('/^'.preg_quote($path,'/').'\s+(\S+)\s+/'.$ci,$AUTH_ACL); if(count($matches)){ foreach($matches as $match){ $match = preg_replace('/#.*$/','',$match); //ignore comments $acl = preg_split('/\s+/',$match); + if (!in_array($acl[1], $groups)) { + continue; + } if($acl[2] > AUTH_DELETE) $acl[2] = AUTH_DELETE; //no admins in the ACL! if($acl[2] > $perm){ $perm = $acl[2]; } } //we had a match - return it - return $perm; + if ($perm != -1) { + return $perm; + } } - //get next higher namespace $ns = getNS($ns); @@ -582,9 +587,6 @@ function auth_aclcheck($id,$user,$groups){ return AUTH_NONE; } }while(1); //this should never loop endless - - //still here? return no permissions - return AUTH_NONE; } /** -- cgit v1.2.3 From fe092d886946cca23fa8ab1be240a356a1f60492 Mon Sep 17 00:00:00 2001 From: Dominik Eckelmann Date: Sun, 11 Dec 2011 11:24:19 +0100 Subject: transfered bugfix from dokuwiki 97a000f0551735b35606d94d59abc4ff440783a5 --- lib/exe/xmlrpc.php | 35 ++++++++++++----------------------- 1 file changed, 12 insertions(+), 23 deletions(-) diff --git a/lib/exe/xmlrpc.php b/lib/exe/xmlrpc.php index cb8dbf42d..bcbae0a43 100644 --- a/lib/exe/xmlrpc.php +++ b/lib/exe/xmlrpc.php @@ -299,17 +299,16 @@ class dokuwiki_xmlrpc_server extends IXR_IntrospectionServer { * @author Gina Haeussge */ function getAttachment($id){ - $id = cleanID($id); - if (auth_quickaclcheck(getNS($id).':*') < AUTH_READ) - return new IXR_Error(1, 'You are not allowed to read this file'); - - $file = mediaFN($id); - if (!@ file_exists($file)) - return new IXR_Error(1, 'The requested file does not exist'); - - $data = io_readFile($file, false); - $base64 = base64_encode($data); - return $base64; + try { + try { + return $this->remote->getAttachment($id); + } catch (RemoteAccessDenied $e) { + return new IXR_Error(1, 'You are not allowed to read this file'); + } + } + catch (RemoteException $e) { + return new IXR_Error(1, $e->getMessage()); + } } /** @@ -318,18 +317,8 @@ class dokuwiki_xmlrpc_server extends IXR_IntrospectionServer { * @author Gina Haeussge */ function getAttachmentInfo($id){ - $id = cleanID($id); - $info = array( - 'lastModified' => 0, - 'size' => 0, - ); - - $file = mediaFN($id); - if ((auth_quickaclcheck(getNS($id).':*') >= AUTH_READ) && file_exists($file)){ - $info['lastModified'] = new IXR_Date(filemtime($file)); - $info['size'] = filesize($file); - } - + $info = $this->remote->getAttachmentInfo($id); + $info['lastModified'] = new IXR_Date($info['lastModified']); return $info; } -- cgit v1.2.3 From 37fa8abdcb4ed0634f9c21c8e6f2d727d1ffd600 Mon Sep 17 00:00:00 2001 From: Dominik Eckelmann Date: Wed, 21 Dec 2011 14:35:48 +0100 Subject: added methods from xmlrpc.php to RemoteAPICore --- inc/RemoteAPICore.php | 174 +++++++++++++++++++++++++++++++++++++++++++------- inc/remote.php | 5 +- 2 files changed, 151 insertions(+), 28 deletions(-) diff --git a/inc/RemoteAPICore.php b/inc/RemoteAPICore.php index 6b34d257a..106ed598c 100644 --- a/inc/RemoteAPICore.php +++ b/inc/RemoteAPICore.php @@ -4,40 +4,167 @@ class RemoteAPICore { function __getRemoteInfo() { return array( - 'wiki.getPage' => array( + 'dokuwiki.getVersion' => array( + 'args' => array(), + 'return' => 'string', + 'doc' => 'Returns the running DokuWiki version.' + ), 'dokuwiki.login' => array( + 'args' => array( + 'username' => 'string', + 'password' => 'string' + ), + 'return' => 'int', + 'doc' => 'Tries to login with the given credentials and sets auth cookies.' + ), 'dokuwiki.getPagelist' => array( + 'args' => array( + 'namespace' => 'string', + 'options' => 'array' + ), + 'return' => 'array', + 'doc' => 'List all pages within the given namespace.', + 'name' => 'readNamespace' + ), 'dokuwiki.search' => array( 'args' => array( - 'id' => array( - 'type' => 'string', - 'doc' => 'wiki page id' - ), + 'search' => 'string' ), + 'return' => 'array', + 'doc' => 'Perform a fulltext search and return a list of matching pages' + ), 'dokuwiki.getTime' => array( + 'args' => array(), + 'return' => 'int', + 'doc' => 'Returns the current time at the remote wiki server as Unix timestamp.', + ), 'dokuwiki.setLocks' => array( + 'args' => array('lock' => 'array'), + 'return' => 'array', + 'doc' => 'Lock or unlock pages.' + ), 'dokuwiki.getTitle' => array( + 'args' => array(), 'return' => 'string', - 'doc' => 'Return a raw wiki page', + 'doc' => 'Returns the wiki title.' + ), 'dokuwiki.appendPage' => array( + 'args' => array( + 'pagename' => 'string', + 'rawWikiText' => 'string', + 'attrs' => 'array' + ), + 'return' => 'int', + 'doc' => 'Append text to a wiki page.' + ), 'wiki.getPage' => array( + 'args' => array( + 'id' => 'string' + ), + 'return' => 'string', + 'doc' => 'Get the raw Wiki text of page, latest version.', 'name' => 'rawPage', - ), - 'wiki.getPageVersion' => array( + ), 'wiki.getPageVersion' => array( 'args' => array( - 'id' => array( - 'type' => 'string', - 'doc' => 'wiki page id' - ), - 'rev' => array( - 'type' => 'int', - 'doc' => 'revision number of the page', - ), + 'id' => 'string', + 'rev' => 'int', ), 'name' => 'rawPage', 'return' => 'string', 'doc' => 'Return a raw wiki page' - ), - 'wiki.getAttachment' => array( + ), 'wiki.getPageHTML' => array( + 'args' => array( + 'id' => 'string' + ), + 'return' => 'string', + 'doc' => 'Return page in rendered HTML, latest version.', + 'name' => 'htmlPage' + ), 'wiki.getPageHTMLVersion' => array( 'args' => array( - 'type' => 'string', - 'doc' => 'file id', + 'id' => 'string', + 'rev' => 'int' ), + 'return' => 'string', + 'doc' => 'Return page in rendered HTML.', + 'name' => 'htmlPage' + ), 'wiki.getAllPages' => array( + 'args' => array(), + 'return' => 'array', + 'doc' => 'Returns a list of all pages. The result is an array of utf8 pagenames.', + 'name' => 'listPages' + ), 'wiki.getAttachments' => array( + 'args' => array( + 'namespace' => 'string', + 'options' => 'array' + ), + 'return' => 'array', + 'doc' => 'Returns a list of all media files.', + 'name' => 'listAttachments' + ), 'wiki.getBackLinks' => array( + 'args' => array( + 'id' => 'string' + ), + 'return' => 'array', + 'doc' => 'Returns the pages that link to this page.', + 'name' => 'listBackLinks' + ), 'wiki.getPageInfo' => array( + 'args' => array('id' => 'string'), + 'return' => 'array', + 'doc' => 'Returns a struct with infos about the page.', + 'name' => 'pageInfo' + ), 'wiki.getPageInfoVersion' => array( + 'args' => array( + 'id' => 'string', + 'version' => 'int', + ), + 'return' => 'array', + 'doc' => 'Returns a struct with infos about the page.', + 'name' => 'pageInfo' + ), 'wiki.getPageVersions' => array( + 'args' => array( + 'id' => 'string', + 'offset' => 'int' + ), + 'return' => 'array', + 'doc' => 'Returns the available revisions of the page.', + 'name' => 'pageVersions' + ), 'wiki.putPage' => array( + 'args' => array( + 'id' => 'string', + 'rawText' => 'string', + 'attrs' => 'array' + ), + 'return' => 'int', + 'doc' => 'Saves a wiki page.' + ), 'wiki.listLinks' => array( + 'args' => array('id' => 'string'), + 'return' => 'array', + 'doc' => 'Lists all links contained in a wiki page.' + ), 'wiki.getRecentChanges' => array( + 'args' => array('timestamp' => 'int'), + 'return' => 'array', + 'Returns a struct about all recent changes since given timestamp.' + ), 'wiki.getRecentMediaChanges' => array( + 'args' => array('timestamp' => 'int'), + 'return' => 'array', + 'Returns a struct about all recent media changes since given timestamp.' + ), 'wiki.aclCheck' => array( + 'args' => array('id' => 'string'), + 'return' => 'int', + 'doc' => 'Returns the permissions of a given wiki page.' + ), 'wiki.putAttachment' => array( + 'args' => array( + 'id' => 'string', + 'data' => 'file', + 'params' => 'array' + ), + 'return' => 'array', + 'doc' => 'Upload a file to the wiki.' + ), 'wiki.deleteAttachment' => array( + 'args' => array('id' => 'string'), + 'return' => 'int', + 'doc' => 'Delete a file from the wiki.' + ), 'wiki.getAttachment' => array( + 'args' => array('id' => 'string'), 'doc' => 'Return a media file', 'return' => 'file', 'name' => 'getAttachment', + ), 'wiki.getAttachmentInfo' => array( + 'args' => array('id' => 'string'), + 'return' => 'array', + 'doc' => 'Returns a struct with infos about the attachment.' ), ); @@ -63,7 +190,7 @@ class RemoteAPICore { } /** - * Return a media file encoded in base64 + * Return a media file * * @author Gina Haeussge * @param string $id file id @@ -92,13 +219,13 @@ class RemoteAPICore { function getAttachmentInfo($id){ $id = cleanID($id); $info = array( - 'lastModified' => 0, + 'lastModified' => new RemoteDate(0), 'size' => 0, ); $file = mediaFN($id); if ((auth_quickaclcheck(getNS($id).':*') >= AUTH_READ) && file_exists($file)){ - $info['lastModified'] = filemtime($file); + $info['lastModified'] = new RemoteDate(filemtime($file)); $info['size'] = filesize($file); } @@ -275,7 +402,6 @@ class RemoteAPICore { function putPage($id, $text, $params) { global $TEXT; global $lang; - global $conf; $id = cleanID($id); $TEXT = cleanText($text); diff --git a/inc/remote.php b/inc/remote.php index 7e82b6845..e18c71092 100644 --- a/inc/remote.php +++ b/inc/remote.php @@ -33,10 +33,7 @@ class RemoteFile extends RemoteDataType {} * array( * 'method.remoteName' => array( * 'args' => array( - * 'name' => array( - * 'type' => 'string|int|...|date|file', - * ['doc' = 'argument documentation'], - * ), + * 'name' => 'type eg. string|int|...|date|file', * ) * 'name' => 'method name in class', * 'return' => 'type', -- cgit v1.2.3 From d80d35e22221ff74c4374f34927a5097362e23d8 Mon Sep 17 00:00:00 2001 From: Dominik Eckelmann Date: Thu, 22 Dec 2011 19:11:31 +0100 Subject: added forgotten remote.php in lib/plugins --- lib/plugins/remote.php | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 lib/plugins/remote.php diff --git a/lib/plugins/remote.php b/lib/plugins/remote.php new file mode 100644 index 000000000..42c2f53c8 --- /dev/null +++ b/lib/plugins/remote.php @@ -0,0 +1,11 @@ + Date: Thu, 22 Dec 2011 20:21:46 +0100 Subject: Japanese language update --- inc/lang/ja/index.txt | 2 +- inc/lang/ja/lang.php | 50 ++++++++++++++++++++++++++++++++++--- lib/plugins/config/lang/ja/lang.php | 7 ++++-- 3 files changed, 53 insertions(+), 6 deletions(-) diff --git a/inc/lang/ja/index.txt b/inc/lang/ja/index.txt index b5fbac97d..b0447899d 100644 --- a/inc/lang/ja/index.txt +++ b/inc/lang/ja/index.txt @@ -1,4 +1,4 @@ -====== 索引 ====== +====== サイトマップ ====== [[doku>namespaces|名前空間]] に基づく、全ての文書の索引です。 diff --git a/inc/lang/ja/lang.php b/inc/lang/ja/lang.php index 1eeb6bb73..15c1e7dd6 100644 --- a/inc/lang/ja/lang.php +++ b/inc/lang/ja/lang.php @@ -29,7 +29,7 @@ $lang['btn_revs'] = '以前のリビジョン'; $lang['btn_recent'] = '最近の変更'; $lang['btn_upload'] = 'アップロード'; $lang['btn_cancel'] = 'キャンセル'; -$lang['btn_index'] = '索引'; +$lang['btn_index'] = 'サイトマップ'; $lang['btn_secedit'] = '編集'; $lang['btn_login'] = 'ログイン'; $lang['btn_logout'] = 'ログアウト'; @@ -48,6 +48,8 @@ $lang['btn_recover'] = 'ドラフトを復元'; $lang['btn_draftdel'] = 'ドラフトを削除'; $lang['btn_revert'] = '元に戻す'; $lang['btn_register'] = 'ユーザー登録'; +$lang['btn_apply'] = '適用'; +$lang['btn_media'] = 'メディアマネージャー'; $lang['loggedinas'] = 'ようこそ'; $lang['user'] = 'ユーザー名'; $lang['pass'] = 'パスワード'; @@ -92,7 +94,7 @@ $lang['txt_filename'] = '名前を変更してアップロード（オ $lang['txt_overwrt'] = '既存のファイルを上書き'; $lang['lockedby'] = 'この文書は次のユーザによってロックされています'; $lang['lockexpire'] = 'ロック期限：'; -$lang['js']['willexpire'] = '編集中の文書はロック期限を過ぎようとしています。このままロックする場合は、一度文書の確認を行って期限をリセットしてください。'; +$lang['js']['willexpire'] = '編集中の文書はロック期限を過ぎようとしています。このままロックする場合は、一度文書の確認を行って期限をリセットしてください。'; $lang['js']['notsavedyet'] = '変更は保存されません。このまま処理を続けてよろしいですか？'; $lang['js']['searchmedia'] = 'ファイル検索'; $lang['js']['keepopen'] = '選択中はウィンドウを閉じない'; @@ -123,9 +125,20 @@ $lang['js']['nosmblinks'] = 'ウィンドウズの共有フォルダへリ $lang['js']['linkwiz'] = 'リンクウィザード'; $lang['js']['linkto'] = 'リンク先：'; $lang['js']['del_confirm'] = '選択した項目を本当に削除しますか？'; +$lang['js']['restore_confirm'] = '本当にこのバージョンを復元しますか?'; +$lang['js']['media_diff'] = '差分の表示方法:'; +$lang['js']['media_diff_both'] = '並べて表示'; +$lang['js']['media_diff_opacity'] = '重ねて透過表示'; +$lang['js']['media_diff_portions'] = '重ねて切替表示'; +$lang['js']['media_select'] = 'ファイルを選択...'; +$lang['js']['media_upload_btn'] = 'アップロード'; +$lang['js']['media_done_btn'] = '完了'; +$lang['js']['media_drop'] = 'ここにファイルをドロップするとアップロードします'; +$lang['js']['media_cancel'] = '削除'; +$lang['js']['media_overwrt'] = '既存のファイルを上書きする'; $lang['rssfailed'] = 'RSSの取得に失敗しました：'; $lang['nothingfound'] = '該当文書はありませんでした。'; -$lang['mediaselect'] = 'メディアファイルを選択'; +$lang['mediaselect'] = 'メディアファイル'; $lang['fileupload'] = 'メディアファイルをアップロード'; $lang['uploadsucc'] = 'アップロード完了'; $lang['uploadfail'] = 'アップロードに失敗しました。権限がありません。'; @@ -177,6 +190,10 @@ $lang['mail_changed'] = '文書の変更：'; $lang['mail_subscribe_list'] = '名前空間内でページが変更：'; $lang['mail_new_user'] = '新規ユーザー：'; $lang['mail_upload'] = 'ファイルのアップロード：'; +$lang['changes_type'] = '表示する変更のタイプ:'; +$lang['pages_changes'] = 'ページの変更'; +$lang['media_changes'] = 'メディアファイルの変更'; +$lang['both_changes'] = 'ページとメディアファイルの変更'; $lang['qb_bold'] = '太字'; $lang['qb_italic'] = '斜体'; $lang['qb_underl'] = '下線'; @@ -217,6 +234,9 @@ $lang['img_copyr'] = '著作権'; $lang['img_format'] = 'フォーマット'; $lang['img_camera'] = '使用カメラ'; $lang['img_keywords'] = 'キーワード'; +$lang['img_width'] = '幅'; +$lang['img_height'] = '高さ'; +$lang['img_manager'] = 'メディアマネージャーで閲覧'; $lang['subscr_subscribe_success'] = '%sが%sの購読リストに登録されました。'; $lang['subscr_subscribe_error'] = '%sを%sの購読リストへの追加に失敗しました。'; $lang['subscr_subscribe_noaddress'] = 'あなたのログインに対応するアドレスがないため、購読リストへ追加することができません。'; @@ -283,3 +303,27 @@ $lang['hours'] = '%d時間前'; $lang['minutes'] = '%d分前'; $lang['seconds'] = '%d秒前'; $lang['wordblock'] = 'スパムと認識されるテキストが含まれているため、変更は保存されませんでした。'; +$lang['media_uploadtab'] = 'アップロード'; +$lang['media_searchtab'] = '検索'; +$lang['media_file'] = 'ファイル'; +$lang['media_viewtab'] = '詳細'; +$lang['media_edittab'] = '編集'; +$lang['media_historytab'] = '履歴'; +$lang['media_list_thumbs'] = 'サムネイル'; +$lang['media_list_rows'] = '行'; +$lang['media_sort_name'] = '名前'; +$lang['media_sort_date'] = '日付'; +$lang['media_namespaces'] = '名前空間を選択'; +$lang['media_files'] = '%s 内のファイル'; +$lang['media_upload'] = '%s にアップロード'; +$lang['media_search'] = '%s 内で検索'; +$lang['media_view'] = '%s'; +$lang['media_viewold'] = '%s at %s'; +$lang['media_edit'] = '%s を編集'; +$lang['media_history'] = '%s の履歴'; +$lang['media_meta_edited'] = 'メタデータが編集されました'; +$lang['media_perm_read'] = 'ファイルを閲覧する権限がありません。'; +$lang['media_perm_upload'] = 'ファイルをアップロードする権限がありません。'; +$lang['media_update'] = '新しいバージョンをアップロード'; +$lang['media_restore'] = 'このバージョンを復元'; +$lang['plugin_install_err'] = 'プラグインが正しくインストールされませんでした。プラグインのディレクトリ名を \'%s\' から \'%s\' に変更してください。'; diff --git a/lib/plugins/config/lang/ja/lang.php b/lib/plugins/config/lang/ja/lang.php index 19f10af48..500d44539 100644 --- a/lib/plugins/config/lang/ja/lang.php +++ b/lib/plugins/config/lang/ja/lang.php @@ -41,9 +41,10 @@ $lang['_msg_setting_no_default'] = '初期値が設定されていません。'; $lang['fmode'] = 'ファイル作成マスク'; $lang['dmode'] = 'フォルダ作成マスク'; $lang['lang'] = '使用言語'; -$lang['basedir'] = 'ベースディレクトリ'; -$lang['baseurl'] = 'ベースURL'; +$lang['basedir'] = 'サーバのパス (例: /dokuwiki/)。空欄にすると自動的に検出します。'; +$lang['baseurl'] = 'サーバの URL (例: http://www.yourserver.com)。空欄にすると自動的に検出します。'; $lang['savedir'] = '保存ディレクトリ'; +$lang['cookiedir'] = 'Cookie のパス。空欄にすると baseurl を使用します。'; $lang['start'] = 'スタートページ名'; $lang['title'] = 'WIKIタイトル'; $lang['template'] = 'テンプレート'; @@ -67,6 +68,7 @@ $lang['useheading'] = '最初の見出しをページ名とする'; $lang['refcheck'] = 'メディア参照元チェック'; $lang['refshow'] = 'メディア参照元表示数'; $lang['allowdebug'] = 'デバッグモード（必要で無いときは無効にしてください）'; +$lang['mediarevisions'] = 'メディアファイルの履歴を有効にしますか?'; $lang['usewordblock'] = '単語リストに基づくスパムブロック'; $lang['indexdelay'] = 'インデックスを許可（何秒後）'; $lang['relnofollow'] = 'rel="nofollow"を付加'; @@ -114,6 +116,7 @@ $lang['jpg_quality'] = 'JPG圧縮品質（0-100）'; $lang['subscribers'] = '更新通知機能'; $lang['subscribe_time'] = '購読リストと概要を送信する期間（秒）。「最近の変更とする期間」で指定した期間より小さくしてください。'; $lang['compress'] = 'CSSとJavaScriptを圧縮'; +$lang['cssdatauri'] = 'HTTP リクエスト数によるオーバーヘッドを減らすため、CSS ファイルから参照される画像ファイルのサイズがここで指定するバイト数以内の場合は CSS ファイル内に Data URI として埋め込みます。このテクニックは IE7 以下では動作しません! 400 から 600 バイトがちょうどよい値です。0 を指定すると埋め込み処理は行われません。'; $lang['hidepages'] = '非公開ページ（Regex）'; $lang['send404'] = '文書が存在しないページに"HTTP404/Page Not Found"を使用'; $lang['sitemap'] = 'Googleサイトマップ作成頻度（日数）'; -- cgit v1.2.3 From c999630672a7a3ff116388f556e895a2cc6dbc01 Mon Sep 17 00:00:00 2001 From: skimpax Date: Thu, 22 Dec 2011 20:22:47 +0100 Subject: French language update --- inc/lang/fr/lang.php | 1 + lib/plugins/acl/lang/fr/lang.php | 1 + lib/plugins/config/lang/fr/lang.php | 2 ++ lib/plugins/plugin/lang/fr/lang.php | 1 + lib/plugins/popularity/lang/fr/lang.php | 1 + lib/plugins/revert/lang/fr/lang.php | 1 + lib/plugins/usermanager/lang/fr/lang.php | 1 + 7 files changed, 8 insertions(+) diff --git a/inc/lang/fr/lang.php b/inc/lang/fr/lang.php index 9399e1758..f92ea92d9 100644 --- a/inc/lang/fr/lang.php +++ b/inc/lang/fr/lang.php @@ -22,6 +22,7 @@ * @author Samuel Dorsaz * @author Johan Guilbaud * @author schplurtz@laposte.net + * @author skimpax@gmail.com */ $lang['encoding'] = 'utf-8'; $lang['direction'] = 'ltr'; diff --git a/lib/plugins/acl/lang/fr/lang.php b/lib/plugins/acl/lang/fr/lang.php index 86f493b52..a33a52bf0 100644 --- a/lib/plugins/acl/lang/fr/lang.php +++ b/lib/plugins/acl/lang/fr/lang.php @@ -21,6 +21,7 @@ * @author Samuel Dorsaz samuel.dorsaz@novelion.net * @author Johan Guilbaud * @author schplurtz@laposte.net + * @author skimpax@gmail.com */ $lang['admin_acl'] = 'Gestion de la liste des contrôles d\'accès (ACL)'; $lang['acl_group'] = 'Groupe'; diff --git a/lib/plugins/config/lang/fr/lang.php b/lib/plugins/config/lang/fr/lang.php index 9b4ecf286..8dcd21032 100644 --- a/lib/plugins/config/lang/fr/lang.php +++ b/lib/plugins/config/lang/fr/lang.php @@ -16,6 +16,7 @@ * @author Samuel Dorsaz samuel.dorsaz@novelion.net * @author Johan Guilbaud * @author schplurtz@laposte.net + * @author skimpax@gmail.com */ $lang['menu'] = 'Paramètres de configuration'; $lang['error'] = 'Paramètres non modifiés en raison d\'une valeur non valide, vérifiez vos réglages et réessayez.
Les valeurs erronées sont entourées d\'une bordure rouge.'; @@ -74,6 +75,7 @@ $lang['useheading'] = 'Utiliser le titre de premier niveau'; $lang['refcheck'] = 'Vérifier les références de média'; $lang['refshow'] = 'Nombre de références de média à montrer'; $lang['allowdebug'] = 'Debug (Ne l\'activez que si vous en avez besoin !)'; +$lang['mediarevisions'] = 'Activer les révisions (gestion de versions) des médias'; $lang['usewordblock'] = 'Bloquer le spam selon les mots utilisés'; $lang['indexdelay'] = 'Délai avant l\'indexation (en secondes)'; $lang['relnofollow'] = 'Utiliser rel="nofollow" sur les liens extérieurs'; diff --git a/lib/plugins/plugin/lang/fr/lang.php b/lib/plugins/plugin/lang/fr/lang.php index b86c57b53..bb0b49872 100644 --- a/lib/plugins/plugin/lang/fr/lang.php +++ b/lib/plugins/plugin/lang/fr/lang.php @@ -16,6 +16,7 @@ * @author Samuel Dorsaz samuel.dorsaz@novelion.net * @author Johan Guilbaud * @author schplurtz@laposte.net + * @author skimpax@gmail.com */ $lang['menu'] = 'Gestion des modules externes'; $lang['download'] = 'Télécharger et installer un nouveau module'; diff --git a/lib/plugins/popularity/lang/fr/lang.php b/lib/plugins/popularity/lang/fr/lang.php index ae12c6683..6b2a40204 100644 --- a/lib/plugins/popularity/lang/fr/lang.php +++ b/lib/plugins/popularity/lang/fr/lang.php @@ -13,6 +13,7 @@ * @author Samuel Dorsaz samuel.dorsaz@novelion.net * @author Johan Guilbaud * @author schplurtz@laposte.net + * @author skimpax@gmail.com */ $lang['name'] = 'Enquête de popularité (peut nécessiter un certain temps pour être chargée)'; $lang['submit'] = 'Envoyer les données'; diff --git a/lib/plugins/revert/lang/fr/lang.php b/lib/plugins/revert/lang/fr/lang.php index 15d4d39c3..9c5194b31 100644 --- a/lib/plugins/revert/lang/fr/lang.php +++ b/lib/plugins/revert/lang/fr/lang.php @@ -14,6 +14,7 @@ * @author Samuel Dorsaz samuel.dorsaz@novelion.net * @author Johan Guilbaud * @author schplurtz@laposte.net + * @author skimpax@gmail.com */ $lang['menu'] = 'Gestionnaire de réversions'; $lang['filter'] = 'Trouver les pages spammées '; diff --git a/lib/plugins/usermanager/lang/fr/lang.php b/lib/plugins/usermanager/lang/fr/lang.php index 875b6d1a6..948262a8f 100644 --- a/lib/plugins/usermanager/lang/fr/lang.php +++ b/lib/plugins/usermanager/lang/fr/lang.php @@ -15,6 +15,7 @@ * @author Samuel Dorsaz samuel.dorsaz@novelion.net * @author Johan Guilbaud * @author schplurtz@laposte.net + * @author skimpax@gmail.com */ $lang['menu'] = 'Gestion des utilisateurs'; $lang['noauth'] = '(authentification utilisateur non disponible)'; -- cgit v1.2.3 From 1fef63e681b0dacd5ac7ad7748071681409be7b7 Mon Sep 17 00:00:00 2001 From: NEOhidra Date: Thu, 22 Dec 2011 23:34:48 +0200 Subject: BG: language update (added "mediarevisions") --- lib/plugins/config/lang/bg/lang.php | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/plugins/config/lang/bg/lang.php b/lib/plugins/config/lang/bg/lang.php index ff03fd9e2..ed29c079b 100644 --- a/lib/plugins/config/lang/bg/lang.php +++ b/lib/plugins/config/lang/bg/lang.php @@ -65,6 +65,7 @@ $lang['useheading'] = 'Ползване на първото загл $lang['refcheck'] = 'Проверка за препратка към медия, преди да бъде изтрита'; $lang['refshow'] = 'Брой на показваните медийни препратки'; $lang['allowdebug'] = 'Включване на режи debug - изключете, ако не е нужен!'; +$lang['mediarevisions'] = 'Да се пазят ли стари версии на качените файлове (Mediarevisions)?'; $lang['usewordblock'] = 'Блокиране на SPAM въз основа на на списък от думи'; $lang['indexdelay'] = 'Забавяне преди индексиране (сек)'; $lang['relnofollow'] = 'Ползване на rel="nofollow" за външни препратки'; -- cgit v1.2.3 From eb2f7e5e56a00f69a13722cc4297a6d6a61bd00f Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Tue, 27 Dec 2011 11:26:02 +0000 Subject: fixed no align option in media settings modal window (FS#2411) --- lib/scripts/media.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/scripts/media.js b/lib/scripts/media.js index 267e64a76..c74633523 100644 --- a/lib/scripts/media.js +++ b/lib/scripts/media.js @@ -253,8 +253,10 @@ var dw_mediamanager = { } } } - alignleft = dw_mediamanager.align === '2' ? '' : ' '; - alignright = dw_mediamanager.align === '4' ? '' : ' '; + if (dw_mediamanager.align !== '1') { + alignleft = dw_mediamanager.align === '2' ? '' : ' '; + alignright = dw_mediamanager.align === '4' ? '' : ' '; + } } } edid = String.prototype.match.call(document.location, /&edid=([^&]+)/); -- cgit v1.2.3 From 46a21be0eb66f244b82a03399151673ceb409e2c Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Mon, 2 Jan 2012 00:32:32 +0000 Subject: updated to latest DokuWiki version (including mediamanager, etc) --- css/_diff.css | 6 +- css/_fileuploader.css | 116 +++++++++++ css/_links.css | 4 +- css/_media_fullscreen.css | 459 ++++++++++++++++++++++++++++++++++++++++++++ css/_media_popup.css | 205 ++++++++++++++++++++ css/_mediamanager.css | 219 --------------------- css/_modal.css | 156 +++------------ css/_recent.css | 6 + css/_tabs.css | 40 ++++ css/basic.css | 5 +- css/content.css | 4 +- detail.php | 72 ++++--- images/apple-touch-icon.png | Bin 0 -> 17728 bytes images/resizecol.png | Bin 0 -> 225 bytes main.php | 11 +- mediamanager.php | 11 +- style.ini | 41 ++-- template.info.txt | 7 + 18 files changed, 958 insertions(+), 404 deletions(-) create mode 100644 css/_fileuploader.css create mode 100644 css/_media_fullscreen.css create mode 100644 css/_media_popup.css delete mode 100755 css/_mediamanager.css create mode 100644 css/_tabs.css create mode 100644 images/apple-touch-icon.png create mode 100644 images/resizecol.png create mode 100644 template.info.txt diff --git a/css/_diff.css b/css/_diff.css index f2be4ae54..62f831213 100755 --- a/css/_diff.css +++ b/css/_diff.css @@ -40,16 +40,16 @@ /* table body */ .dokuwiki table.diff td { - font-family: Consolas, "Andale Mono WT", "Andale Mono", "Bitstream Vera Sans Mono", "Liberation Mono", Monaco, "Courier New", monospace; + 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 td.diff-addedline { +.dokuwiki table.diff .diff-addedline { background-color: #cfc; color: inherit; } -.dokuwiki table.diff td.diff-deletedline { +.dokuwiki table.diff .diff-deletedline { background-color: #fdd; color: inherit; } diff --git a/css/_fileuploader.css b/css/_fileuploader.css new file mode 100644 index 000000000..0b7cc8b42 --- /dev/null +++ b/css/_fileuploader.css @@ -0,0 +1,116 @@ +/** + * 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 */ + +.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; + 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/_links.css b/css/_links.css index 7e7f18268..6b19c3a24 100755 --- a/css/_links.css +++ b/css/_links.css @@ -39,11 +39,12 @@ .dokuwiki a.interwiki { background-repeat: no-repeat; background-position: 0 center; - padding: 0 0 0 17px; + padding: 0 0 0 20px; } /* external link */ .dokuwiki a.urlextern { background-image: url(images/link_icon.gif); + padding: 0 0 0 17px; } /* windows share */ .dokuwiki a.windows { @@ -60,4 +61,5 @@ } /* interwiki link */ .dokuwiki a.interwiki { + padding: 0 0 0 17px; } diff --git a/css/_media_fullscreen.css b/css/_media_fullscreen.css new file mode 100644 index 000000000..52c893c8b --- /dev/null +++ b/css/_media_fullscreen.css @@ -0,0 +1,459 @@ +/** + * 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: 0 0 .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; +} + +#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__; +} + + +#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 ____________*/ + +#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.4em; +} +* html #mediamanager__page .namespaces h2, +*+html #mediamanager__page .namespaces h2 { + display: inline; +} + +#mediamanager__page .namespaces ul { + margin-left: .2em; + margin-bottom: 0; + padding: 0; + list-style: none; +} +#mediamanager__page .namespaces ul ul { + margin-left: 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; +} + +#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: .3em .5em; + line-height: 1; +} + +/* file list content */ + +#mediamanager__page .filelist ul { + padding: 0; + margin: 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; +} +* 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 { + margin-left: 10px; + padding: 0; + list-style-type: none; +} + +#mediamanager__page #page__revisions ul li div.li div { + font-size: 90%; + color: __text_neu__; + padding-left: 18px; +} + +#mediamanager__page #page__revisions ul li div.li input { + 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__; +} + +#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 .image1, +#mediamanager__diff .imageDiff .image2 { + width: 97%; +} +#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 img { + width: 100%; +} + diff --git a/css/_media_popup.css b/css/_media_popup.css new file mode 100644 index 000000000..0469c8e60 --- /dev/null +++ b/css/_media_popup.css @@ -0,0 +1,205 @@ +/** + * 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__; +} +#mediamgr__aside .pad { + padding: .5em; +} + +#mediamgr__content { + width: 69.7%; + height: 100%; + overflow: auto; + position: absolute; + right: 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; +} +#media__opts label { +} + +/*____________ tree ____________*/ + +#media__tree ul { + padding-left: .2em; +} +#media__tree ul li { + clear: left; + list-style-type: none; + list-style-image: none; + margin-left: 0; +} +#media__tree ul li img { + float: left; + padding: .5em .3em 0 0; +} +#media__tree ul li div.li { + display: inline; +} +#media__tree ul li li { + margin-left: 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; +} +#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; +} +#media__content div.detail div.thumb a { + display: block; + cursor: pointer; +} +#media__content div.detail p { + margin-bottom: 0; +} + + +/*____________ media search ____________*/ + +form#dw__mediasearch { +} +form#dw__mediasearch p { +} +form#dw__mediasearch label { +} +form#dw__mediasearch label span { +} +form#dw__mediasearch input.edit { +} +form#dw__mediasearch input.button { +} + + +/* meta edit form +********************************************************************/ + +#media__content form.meta { +} + +#media__content form.meta div.metafield { + clear: left; + margin-bottom: .5em; + overflow: hidden; +} + +#media__content form.meta label { + display: block; + width: 25%; + float: left; + font-weight: bold; + clear: left; +} +#media__content form.meta .edit { + float: left; + width: 70%; + margin: 0; +} +#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%; +} diff --git a/css/_mediamanager.css b/css/_mediamanager.css deleted file mode 100755 index d47e581ff..000000000 --- a/css/_mediamanager.css +++ /dev/null @@ -1,219 +0,0 @@ -/** - * This file provides styles for the media manager - * (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__; -} -#mediamgr__aside .pad { - padding: .5em; -} - -#mediamgr__content { - width: 69.7%; - height: 100%; - overflow: auto; - position: absolute; - right: 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; -} -#media__opts label { -} - -/*____________ tree ____________*/ - -#media__tree ul { - padding-left: .2em; -} -#media__tree ul li { - clear: left; - list-style-type: none; - list-style-image: none; - margin-left: 0; -} -#media__tree ul li img { - float: left; - padding: .5em .3em 0 0; -} -#media__tree ul li div.li { - display: inline; -} -#media__tree ul li li { - margin-left: 1.5em; -} - -/* right side -********************************************************************/ - -/*____________ upload form ____________*/ - -/* upload info */ -#media__content div.upload { - font-size: .9em; - margin-bottom: .5em; -} - -#media__content form#dw__upload, -#media__content div#dw__flashupload { - display: block; - border-bottom: solid 1px __border__; - padding-bottom: 1em; - margin-bottom: 1em; -} -#media__content form#dw__upload p { - margin-bottom: .5em; -} - -#media__content form#dw__upload label { -} -#media__content form#dw__upload label.check { -} -#media__content form#dw__upload input.check { -} -#media__content form#dw__upload input.edit { -} -#media__content form#dw__upload img { -} - -/*____________ 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; -} -#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; -} -#media__content div.detail div.thumb a { - display: block; -} -#media__content div.detail p { - margin-bottom: 0; -} - - -/*____________ media search ____________*/ - -form#dw__mediasearch { -} -form#dw__mediasearch p { -} -form#dw__mediasearch label { -} -form#dw__mediasearch label span { -} -form#dw__mediasearch input.edit { -} -form#dw__mediasearch input.button { -} - - -/* meta edit form -********************************************************************/ - -#media__content form.meta { -} - -#media__content form.meta div.metafield { - clear: left; - margin-bottom: .5em; - overflow: hidden; -} - -#media__content form.meta label { - display: block; - width: 25%; - float: left; - font-weight: bold; - clear: left; -} -#media__content form.meta .edit { - float: left; - width: 70%; - margin: 0; -} -#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%; -} diff --git a/css/_modal.css b/css/_modal.css index 89eb48dab..125f702a8 100755 --- a/css/_modal.css +++ b/css/_modal.css @@ -1,36 +1,16 @@ - -/* TODO */ - /** * 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 { - position: absolute; - display: block; - z-index: 99; - width: 300px; - height: 250px; - padding: 0; - margin: 0; - overflow: hidden; - border: 1px solid __border__; - background-color: __background_neu__; - text-align: center; -} - -#link__wiz_header { - background-color: __background_alt__; - height: 16px; - margin-bottom: 5px; -} - -#link__wiz_close { - cursor: pointer; - margin: 0; } #link__wiz_result { @@ -41,21 +21,28 @@ border: 1px solid __border__; margin: 3px auto; text-align: left; + line-height: 1; } -#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 { + padding: 3px 3px 3px 0; } -#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 a { + display: block; + padding-left: 22px; + min-height: 16px; + background: transparent 3px center 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.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 { @@ -69,107 +56,28 @@ #link__wiz_result span { display: block; color: __text_neu__; -} - -/*FIXME maybe move to a more general style sheet*/ -.ondrag { - cursor: move; - opacity: 0.8; + margin-left: 22px; } /* media option wizard (opens when inserting media in the media popup) ********************************************************************/ -/* --- popup --- */ - #media__popup { - background-color:__background__; - display:none; - border: 1px solid __border__; - position: absolute; - width:270px; -} - -#media__popup h1 { - text-align:center; - font-weight:normal; - background-color: __background_alt__; - height: 16px; - margin-bottom: 5px; - font-size:12px; - border-bottom: 0; + /* for backwards compatibility (not needed since Rincewind) */ + display: none; } -#media__popup p { - display:block; - line-height:14pt; - margin:0.5em; +#media__popup_content p { + margin: 0 0 .5em; } -#media_nolink { - padding:4px 0; +#media__popup_content label { + margin-right: .5em; + cursor: default; } -#media__popup label { - float:left; - width:9em; -} - -#media__popup .button { - margin-left:auto; - margin-right:auto; -} - -#media__popup .btnlbl { - text-align:center; -} - -#media__popup .btnlbl input { - margin:0 1em; -} - -#media__closeimg { - float:right; -} - -/* --- display options --- */ - -#media__linkopts label, -#media__nolnk { - width: 80px; - float: left; - margin-left: 10px; -} - -#media__linkopts label{ - line-height: 20px; -} - -#media__nolnk, -#media__linkopts label.long{ - margin-bottom: 8px; - line-height: 12px; -} - -#media__linkopts label.long{ - width: 150px; - float: none; -} - -#media__linkopts br { - clear: both; -} - -#media__linkopts select { - width: 60px; - margin-left: 10px; -} - -#media__linkopts input.edit { - width:50px; - margin-left:10px; -} -#media__linkopts #media__title { - width:150px; +#media__popup_content .button { + margin-right: 1px; + cursor: pointer; } diff --git a/css/_recent.css b/css/_recent.css index 98646e057..0e3745cbd 100755 --- a/css/_recent.css +++ b/css/_recent.css @@ -5,6 +5,12 @@ /*____________ list of revisions / recent changes ____________*/ +/* select type of revisions (media/pages), should have a class on it's own, but hasn't */ +.dokuwiki #dw__recent label { + margin-bottom: .5em; + display: block; +} + .dokuwiki #dw__recent ul li, .dokuwiki #page__revisions ul li { list-style: none; diff --git a/css/_tabs.css b/css/_tabs.css new file mode 100644 index 000000000..de544fd2b --- /dev/null +++ b/css/_tabs.css @@ -0,0 +1,40 @@ +/** + * This file provides the styles for general tabs. + */ + +.dokuwiki ul.tabs { + padding: 0; + margin: 0; + overflow: hidden; +} +.dokuwiki ul.tabs li { + float: left; + padding: 0; + margin: 0; + list-style: none; +} + +.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; +} +.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/css/basic.css b/css/basic.css index 51d1ed7ed..1ceddc05d 100755 --- a/css/basic.css +++ b/css/basic.css @@ -45,6 +45,7 @@ caption, legend { color: #000;/* @todo: style.ini */ background-color: inherit; padding: 0; + line-height: 1.2; clear: left; /* ideally 'both', but problems with toc */ } @@ -189,7 +190,7 @@ acronym, abbr { } pre, code, samp, kbd { - font-family: Consolas, "Andale Mono WT", "Andale Mono", "Bitstream Vera Sans Mono", "Liberation Mono", Monaco, "Courier New", monospace; + font-family: Consolas, "Andale Mono WT", "Andale Mono", "Bitstream Vera Sans Mono", "Nimbus Mono L", Monaco, "Courier New", monospace; /* same font stack should be used for ".dokuwiki table.diff td" in _diff.css */ font-size: 1em; direction: ltr; @@ -301,7 +302,7 @@ option { font-style: normal; font-weight: normal; } /*____________ general classes ____________*/ div.clearer { - /* additional to what's already in lib/styles/style.css: */ + /* additional to what's already in lib/styles/all.css: */ font-size: 1px; visibility: hidden; } diff --git a/css/content.css b/css/content.css index 60b1d6771..64adda388 100755 --- a/css/content.css +++ b/css/content.css @@ -25,7 +25,7 @@ /*____________ images ____________*/ -/* embedded images (styles are already partly set in lib/styles/style.css) */ +/* embedded images (styles are already partly set in lib/styles/all.css) */ .dokuwiki img.media { } .dokuwiki img.medialeft { margin: .5em 1.5em .5em 0; } .dokuwiki img.mediaright { margin: .5em 0 .5em 1.5em; } @@ -64,7 +64,7 @@ .dokuwiki samp, .dokuwiki kbd { background-color: __background_alt__; - color: inherit; + color: __text__; } /* fix if background-color hides underlining */ .dokuwiki em.u code { diff --git a/detail.php b/detail.php index 500890114..13ba1b9da 100755 --- a/detail.php +++ b/detail.php @@ -2,12 +2,14 @@ /** * DokuWiki Image Detail Page * - * @author Andreas Gohr - * @author Anika Henke + * @author Andreas Gohr + * @author Anika Henke + * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) */ // must be run from within DokuWiki if (!defined('DOKU_INC')) die(); +@require_once(dirname(__FILE__).'/tpl_functions.php'); /* include hook for template functions */ ?> @@ -20,7 +22,9 @@ if (!defined('DOKU_INC')) die(); [] - + + + @@ -40,30 +44,32 @@ if (!defined('DOKU_INC')) die();
'.$lang['img_date'].':
'.dformat($t).'
'; - - $t = tpl_img_getTag('File.Name'); - if($t) print '
'.$lang['img_fname'].':
'.hsc($t).'
'; - - $t = tpl_img_getTag(array('Iptc.Byline','Exif.TIFFArtist','Exif.Artist','Iptc.Credit')); - if($t) print '
'.$lang['img_artist'].':
'.hsc($t).'
'; - - $t = tpl_img_getTag(array('Iptc.CopyrightNotice','Exif.TIFFCopyright','Exif.Copyright')); - if($t) print '
'.$lang['img_copyr'].':
'.hsc($t).'
'; - - $t = tpl_img_getTag('File.Format'); - if($t) print '
'.$lang['img_format'].':
'.hsc($t).'
'; - - $t = tpl_img_getTag('File.NiceSize'); - if($t) print '
'.$lang['img_fsize'].':
'.hsc($t).'
'; - - $t = tpl_img_getTag('Simple.Camera'); - if($t) print '
'.$lang['img_camera'].':
'.hsc($t).'
'; - - $t = tpl_img_getTag(array('IPTC.Keywords','IPTC.Category','xmp.dc:subject')); - if($t) print '
'.$lang['img_keywords'].':
'.hsc($t).'
'; - + $config_files = getConfigFiles('mediameta'); + foreach ($config_files as $config_file) { + if(@file_exists($config_file)) { + include($config_file); + } + } + + foreach($fields as $key => $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 '
'; + } + } ?>
@@ -71,7 +77,17 @@ if (!defined('DOKU_INC')) die();
-

←

+

+ = AUTH_UPLOAD) && function_exists('media_managerURL')) { + $mmURL = media_managerURL(array('ns' => $imgNS, 'image' => $IMG)); + echo ''.$lang['img_manager'].'
'; + } + ?> + ← +

diff --git a/images/apple-touch-icon.png b/images/apple-touch-icon.png new file mode 100644 index 000000000..45fa4e7b0 Binary files /dev/null and b/images/apple-touch-icon.png differ diff --git a/images/resizecol.png b/images/resizecol.png new file mode 100644 index 000000000..f0111507c Binary files /dev/null and b/images/resizecol.png differ diff --git a/main.php b/main.php index 6f6933241..0a0765065 100755 --- a/main.php +++ b/main.php @@ -1,9 +1,11 @@ + * @link http://dokuwiki.org/template + * @author Anika Henke + * @author Clarence Lee + * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) */ if (!defined('DOKU_INC')) die(); /* must be run from within DokuWiki */ @@ -18,7 +20,8 @@ $showTools = !tpl_getConf('hideTools') || ( tpl_getConf('hideTools') && $_SERVER <?php tpl_pagetitle() ?> [<?php echo strip_tags($conf['title']) ?>] - + + diff --git a/mediamanager.php b/mediamanager.php index 0f4362577..94c7a0149 100755 --- a/mediamanager.php +++ b/mediamanager.php @@ -2,8 +2,13 @@ /** * DokuWiki Media Manager Popup * - * @author Andreas Gohr + * @author Andreas Gohr + * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) */ +// must be run from within DokuWiki +if (!defined('DOKU_INC')) die(); +@require_once(dirname(__FILE__).'/tpl_functions.php'); /* include hook for template functions */ + ?> ] - + + + diff --git a/style.ini b/style.ini index fe4f35e07..7ed33ab4e 100755 --- a/style.ini +++ b/style.ini @@ -8,23 +8,26 @@ [stylesheets] -css/basic.css = screen -css/structure.css = screen -css/design.css = screen -css/content.css = screen -css/_imgdetail.css = screen -css/_mediamanager.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/includes.css = screen +css/basic.css = screen +css/structure.css = screen +css/design.css = screen +css/content.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/includes.css = screen #css/default.css = screen css/rtl.css = rtl @@ -66,5 +69,5 @@ __highlight__ = "#ff9" ; @todo: width in em or px? __site_width__ = "72em" ;__site_width__ = "1000px" -__sidebar_width__ = "16em" -;__sidebar_width__ = "220px" +__sidebar_width__ = "16em" +;__sidebar_width__ = "220px" diff --git a/template.info.txt b/template.info.txt new file mode 100644 index 000000000..891a89c0e --- /dev/null +++ b/template.info.txt @@ -0,0 +1,7 @@ +base dokuwiki +author Anika Henke, Clarence Lee +email andi@splitbrain.org +date devel +name DokuWiki Template +desc DokuWiki's default template 2012 +url http://www.dokuwiki.org/template -- cgit v1.2.3 From fdb80d4d631a5ccf2d7d215df0dd3c7f353a2aa0 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Mon, 2 Jan 2012 00:33:37 +0000 Subject: don't show sidebar with fullscreen mediamanager --- css/structure.css | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/css/structure.css b/css/structure.css index ea64f4867..60343fac3 100755 --- a/css/structure.css +++ b/css/structure.css @@ -51,6 +51,17 @@ body { margin-left: __sidebar_width__; } + /* don't show sidebar with fullscreen media manager */ + .mode_media #dokuwiki__aside { + display: none; + } + .mode_media #dokuwiki__content, + .mode_media #dokuwiki__content .pad { + float: none; + margin-left: 0; + margin-right: 0; + } + #dokuwiki__footer { clear: both; } -- cgit v1.2.3 From 4654f3c5118bc780a60185a3c88326232f5f6dd9 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Mon, 2 Jan 2012 14:11:59 +0000 Subject: made form elements more generic, added some style.ini values --- css/_fileuploader.css | 4 -- css/basic.css | 115 ++++++++++++++++++++++++-------------------------- css/content.css | 5 ++- css/design.css | 12 +++++- 4 files changed, 70 insertions(+), 66 deletions(-) diff --git a/css/_fileuploader.css b/css/_fileuploader.css index 0b7cc8b42..42004de28 100644 --- a/css/_fileuploader.css +++ b/css/_fileuploader.css @@ -17,14 +17,10 @@ .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, diff --git a/css/basic.css b/css/basic.css index 1ceddc05d..2ad21b6ca 100755 --- a/css/basic.css +++ b/css/basic.css @@ -13,18 +13,14 @@ html { overflow-y: scroll; } html, body { - /* @todo: style.ini */ + /* @todo: style.ini for #fbfaf9?!? */ background-color: #fbfaf9; color: __text__; - background-image: -moz-linear-gradient( top, #ddd 0%, #eee 1em, #fbfaf9 4em); - /* do we want to support old browsers? - background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#ddd), color-stop(1em,#eee), color-stop(4em,#fbfaf9)); - filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#ddd', endColorstr='#fbfaf9',GradientType=0 ); - */ - background-image: -webkit-linear-gradient(top, #ddd 0%, #eee 1em, #fbfaf9 4em); - background-image: -o-linear-gradient( top, #ddd 0%, #eee 1em, #fbfaf9 4em); - background-image: -ms-linear-gradient( top, #ddd 0%, #eee 1em, #fbfaf9 4em); - background-image: linear-gradient( top, #ddd 0%, #eee 1em, #fbfaf9 4em); + background-image: -moz-linear-gradient( top, __background_neu__ 0%, __background_alt__ 1em, #fbfaf9 4em); + background-image: -webkit-linear-gradient(top, __background_neu__ 0%, __background_alt__ 1em, #fbfaf9 4em); + background-image: -o-linear-gradient( top, __background_neu__ 0%, __background_alt__ 1em, #fbfaf9 4em); + background-image: -ms-linear-gradient( top, __background_neu__ 0%, __background_alt__ 1em, #fbfaf9 4em); + background-image: linear-gradient( top, __background_neu__ 0%, __background_alt__ 1em, #fbfaf9 4em); background-size: 1px 10em; background-repeat: repeat-x; margin: 0; @@ -174,8 +170,8 @@ img { } hr { - border-top: solid #ccc; - border-bottom: solid #fff; + border-top: solid __border__; + border-bottom: solid __background__; border-width: 1px 0; height: 0; width: 100%; @@ -239,66 +235,75 @@ label { vertical-align: middle; cursor: pointer; } -input, textarea, button, -select, optgroup, option { + +input, +textarea, +button, +select, +optgroup, +option { font: inherit; color: inherit; - /* background-color destroys button look */ line-height: 1; margin: 0; vertical-align: middle; } -input[type=text], input[type=password], textarea { - padding: .1em; -} -input[type=radio], input[type=checkbox], input.check { + +input::-moz-focus-inner, +button::-moz-focus-inner { + border: 0; padding: 0; } -input[type=submit], input.button, button { - cursor: pointer; -} -input[disabled], button[disabled], -input[readonly], button[readonly] { +input[disabled], +button[disabled], +input[readonly], +button[readonly] { cursor: auto; } -optgroup { font-style: italic; font-weight: bold; } -option { font-style: normal; font-weight: normal; } +optgroup { + font-style: italic; + font-weight: bold; +} +option { + font-style: normal; + font-weight: normal; +} -/* @todo: either make input.edit and buttons more generic or put into design.css */ -.dokuwiki input.edit { +input, +textarea, +select { border: 1px solid __border__; - padding: 0.35em .1em; -moz-box-shadow: inset 0 0 1px __background_alt__; -webkit-box-shadow: inset 0 0 1px __background_alt__; box-shadow: inset 0 0 1px __background_alt__; border-radius: 2px; - vertical-align: middle; } -.dokuwiki input.button, -.dokuwiki button.button, -.dokuwiki div.toolbar button.toolbutton { - /* @todo: make style.ini colours any sense here? */ - vertical-align: middle; - color: inherit; +input[type=radio], +input[type=checkbox] { + padding: 0; + border-width: 0; +} + +input[type=submit], +input.button, +a.button, +button, +.qq-upload-button { + /* no style.ini colours on purpose */ + color: #333; background-color: #eee; - background: -moz-linear-gradient(top, #ffffff 0%, #f4f4f4 30%, #eeeeee 99%, #cccccc 99%); - background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#ffffff), color-stop(30%,#f4f4f4), color-stop(99%,#eeeeee), color-stop(99%,#cccccc)); - background: -webkit-linear-gradient(top, #ffffff 0%,#f4f4f4 30%,#eeeeee 99%,#cccccc 99%); - background: -o-linear-gradient(top, #ffffff 0%,#f4f4f4 30%,#eeeeee 99%,#cccccc 99%); - background: -ms-linear-gradient(top, #ffffff 0%,#f4f4f4 30%,#eeeeee 99%,#cccccc 99%); - /* - filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#ffffff', endColorstr='#cccccc',GradientType=0 ); - */ - background: linear-gradient(top, #ffffff 0%,#f4f4f4 30%,#eeeeee 99%,#cccccc 99%); + /* @todo: #ccc on purpose? */ + background: -moz-linear-gradient( top, #ffffff 0%, #f4f4f4 30%, #eeeeee 99%, #cccccc 99%); + background: -webkit-linear-gradient(top, #ffffff 0%, #f4f4f4 30%, #eeeeee 99%, #cccccc 99%); + background: -o-linear-gradient( top, #ffffff 0%, #f4f4f4 30%, #eeeeee 99%, #cccccc 99%); + background: -ms-linear-gradient( top, #ffffff 0%, #f4f4f4 30%, #eeeeee 99%, #cccccc 99%); + background: linear-gradient( top, #ffffff 0%, #f4f4f4 30%, #eeeeee 99%, #cccccc 99%); border: 1px solid #ccc; border-radius: 2px; -} -.dokuwiki textarea.edit { - font-family: Consolas, "Andale Mono WT", "Andale Mono", "Bitstream Vera Sans Mono", "Liberation Mono", Monaco, "Courier New", monospace; + padding: .1em .5em; + cursor: pointer; } - - /*____________ general classes ____________*/ div.clearer { @@ -306,13 +311,3 @@ div.clearer { font-size: 1px; visibility: hidden; } - -.a11y { - position: absolute; - left: -9000px; - top: -4000px; - width: 0; - height: 0; - overflow: hidden; - display: inline; -} diff --git a/css/content.css b/css/content.css index 64adda388..376c6f6dd 100755 --- a/css/content.css +++ b/css/content.css @@ -86,8 +86,11 @@ .dokuwiki dl.code dt, .dokuwiki dl.file dt { background-color: __background_alt__; - /* @todo: add gradients for other browsers */ + background: -moz-linear-gradient( top, __background__ 0%, __background_alt__ 100%); background: -webkit-linear-gradient(top, __background__ 0%, __background_alt__ 100%); + background: -o-linear-gradient( top, __background__ 0%, __background_alt__ 100%); + background: -ms-linear-gradient( top, __background__ 0%, __background_alt__ 100%); + background: linear-gradient( top, __background__ 0%, __background_alt__ 100%); color: inherit; border: 1px solid __border__; border-bottom-color: __background_alt__; diff --git a/css/design.css b/css/design.css index 4660e4540..9e79ccd80 100755 --- a/css/design.css +++ b/css/design.css @@ -254,7 +254,7 @@ } #dokuwiki__sitetools form.search input.edit { width: 16em; - padding-right: 22px; + padding: .35em 22px .35em .1em; } #dokuwiki__sitetools form.search input.button { background: transparent url(images/search.png) no-repeat 0 0; @@ -414,6 +414,16 @@ border-bottom-right-radius: 4px; } +.dokuwiki textarea.edit { + font-family: Consolas, "Andale Mono WT", "Andale Mono", "Bitstream Vera Sans Mono", "Liberation Mono", Monaco, "Courier New", monospace; +} + + +#acl__tree li { + margin: 0; +} + + /*____________ JS popup ____________*/ .JSpopup { -- cgit v1.2.3 From bb80cf81708740f35cd1540640df27b534b2bf84 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Mon, 2 Jan 2012 14:12:29 +0000 Subject: don't show sidebar in admin --- css/structure.css | 9 ++++++--- style.ini | 1 - 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/css/structure.css b/css/structure.css index 60343fac3..19f351620 100755 --- a/css/structure.css +++ b/css/structure.css @@ -51,12 +51,15 @@ body { margin-left: __sidebar_width__; } - /* don't show sidebar with fullscreen media manager */ - .mode_media #dokuwiki__aside { + /* don't show sidebar with fullscreen media manager or in the admin */ + .mode_media #dokuwiki__aside, + .mode_admin #dokuwiki__aside { display: none; } .mode_media #dokuwiki__content, - .mode_media #dokuwiki__content .pad { + .mode_media #dokuwiki__content .pad, + .mode_admin #dokuwiki__content, + .mode_admin #dokuwiki__content .pad { float: none; margin-left: 0; margin-right: 0; diff --git a/style.ini b/style.ini index 7ed33ab4e..3a9e9dfc2 100755 --- a/style.ini +++ b/style.ini @@ -28,7 +28,6 @@ css/_modal.css = screen css/_forms.css = screen css/_admin.css = screen css/includes.css = screen -#css/default.css = screen css/rtl.css = rtl css/print.css = print -- cgit v1.2.3 From cf3eea6837d69ee00cceec5cb64b117a44d2f570 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Wed, 4 Jan 2012 01:01:12 +0000 Subject: fixed alternative version02 of pagetools style --- css/design.css | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/css/design.css b/css/design.css index 9e79ccd80..388e50fc6 100755 --- a/css/design.css +++ b/css/design.css @@ -137,11 +137,24 @@ box-shadow: .1em .1em .1em __text__; margin: 0 -.5em; } +#dokuwiki__pagetools.version02:hover ul li a span, +#dokuwiki__pagetools.version02:active ul li a span, +#dokuwiki__pagetools.version02:focus ul li a span, #dokuwiki__pagetools.version03:hover ul li a span, #dokuwiki__pagetools.version03:active ul li a span, #dokuwiki__pagetools.version03:focus ul li a span { display: inline; } +#dokuwiki__pagetools.version02 ul { + margin: 0 -.5em; + border: 1px solid transparent; +} +#dokuwiki__pagetools.version02:hover ul { + border: 1px solid __border__; + border-radius: 2px; + background-color: __background__; + box-shadow: .1em .1em .1em __text__; +} #dokuwiki__pagetools ul li { @@ -160,9 +173,7 @@ white-space: nowrap; border: 1px solid transparent; } -#dokuwiki__pagetools.version02 ul li a { - padding: .2em 34px .2em .5em; -} +#dokuwiki__pagetools.version02 ul li a, #dokuwiki__pagetools.version03 ul li a { padding: .2em 34px .2em .5em; } -- cgit v1.2.3 From ee6bf45dd5a159e38e0dac99cc6afc6cf3df59e4 Mon Sep 17 00:00:00 2001 From: Michael Hamann Date: Wed, 4 Jan 2012 10:53:57 +0100 Subject: Correct two spaces in the French translation of the popularity plugin Thanks to Anael in the DokuWiki IRC channel for spotting the errors. --- lib/plugins/popularity/lang/fr/lang.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/plugins/popularity/lang/fr/lang.php b/lib/plugins/popularity/lang/fr/lang.php index 6b2a40204..9ff7a7e8b 100644 --- a/lib/plugins/popularity/lang/fr/lang.php +++ b/lib/plugins/popularity/lang/fr/lang.php @@ -19,6 +19,6 @@ $lang['name'] = 'Enquête de popularité (peut nécessiter un c $lang['submit'] = 'Envoyer les données'; $lang['autosubmit'] = 'Envoyer les données automatiquement chaque mois'; $lang['submissionFailed'] = 'Les données ne peuvent pas être envoyées à cause des erreurs suivantes :'; -$lang['submitDirectly'] = 'Vous pouvez envoyer le données manuellement en soumettant ce formulaire.'; +$lang['submitDirectly'] = 'Vous pouvez envoyer le données manuellement en soumettant ce formulaire.'; $lang['autosubmitError'] = 'La dernière soumission automatique a échoué pour les raisons suivantes :'; -$lang['lastSent'] = 'Les données ont été envoyées'; +$lang['lastSent'] = 'Les données ont été envoyées '; -- cgit v1.2.3 From b87a370164b2bce9dd27c90713ac92b14ef194dd Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Wed, 4 Jan 2012 14:11:03 +0100 Subject: added new icons used http://blog.twg.ca/2009/09/free-iphone-toolbar-icons/ --- css/design.css | 55 +++++++++++++++++++++------ images/pagetools/arrow_redo.png | Bin 625 -> 0 bytes images/pagetools/arrow_up.png | Bin 372 -> 0 bytes images/pagetools/backlink-active.png | Bin 611 -> 1053 bytes images/pagetools/backlink.png | Bin 514 -> 998 bytes images/pagetools/create-active.png | Bin 0 -> 920 bytes images/pagetools/create.png | Bin 0 -> 885 bytes images/pagetools/edit-active.png | Bin 654 -> 845 bytes images/pagetools/edit.png | Bin 552 -> 807 bytes images/pagetools/email_star.png | Bin 739 -> 0 bytes images/pagetools/inbox-document-text.png | Bin 665 -> 0 bytes images/pagetools/page.png | Bin 635 -> 0 bytes images/pagetools/page_code.png | Bin 818 -> 0 bytes images/pagetools/pagetools.xcf | Bin 0 -> 11966 bytes images/pagetools/pencil.png | Bin 450 -> 0 bytes images/pagetools/pencil_add.png | Bin 742 -> 0 bytes images/pagetools/revert-active.png | Bin 0 -> 794 bytes images/pagetools/revert.png | Bin 0 -> 768 bytes images/pagetools/revisions-active.png | Bin 0 -> 1543 bytes images/pagetools/revisions.png | Bin 0 -> 1520 bytes images/pagetools/revs-active.png | Bin 813 -> 0 bytes images/pagetools/revs.png | Bin 717 -> 0 bytes images/pagetools/show-active.png | Bin 0 -> 455 bytes images/pagetools/show.png | Bin 0 -> 454 bytes images/pagetools/site_backup_and_restore.png | Bin 745 -> 0 bytes images/pagetools/source-active.png | Bin 0 -> 944 bytes images/pagetools/source.png | Bin 0 -> 921 bytes images/pagetools/subscribe-active.png | Bin 0 -> 769 bytes images/pagetools/subscribe.png | Bin 0 -> 750 bytes images/pagetools/time.png | Bin 793 -> 0 bytes images/pagetools/top-active.png | Bin 609 -> 506 bytes images/pagetools/top.png | Bin 528 -> 494 bytes 32 files changed, 43 insertions(+), 12 deletions(-) delete mode 100644 images/pagetools/arrow_redo.png delete mode 100644 images/pagetools/arrow_up.png create mode 100644 images/pagetools/create-active.png create mode 100644 images/pagetools/create.png delete mode 100644 images/pagetools/email_star.png delete mode 100644 images/pagetools/inbox-document-text.png delete mode 100644 images/pagetools/page.png delete mode 100644 images/pagetools/page_code.png create mode 100644 images/pagetools/pagetools.xcf delete mode 100644 images/pagetools/pencil.png delete mode 100644 images/pagetools/pencil_add.png create mode 100644 images/pagetools/revert-active.png create mode 100644 images/pagetools/revert.png create mode 100644 images/pagetools/revisions-active.png create mode 100644 images/pagetools/revisions.png delete mode 100644 images/pagetools/revs-active.png delete mode 100644 images/pagetools/revs.png create mode 100644 images/pagetools/show-active.png create mode 100644 images/pagetools/show.png delete mode 100644 images/pagetools/site_backup_and_restore.png create mode 100644 images/pagetools/source-active.png create mode 100644 images/pagetools/source.png create mode 100644 images/pagetools/subscribe-active.png create mode 100644 images/pagetools/subscribe.png delete mode 100644 images/pagetools/time.png diff --git a/css/design.css b/css/design.css index 388e50fc6..f798b03cc 100755 --- a/css/design.css +++ b/css/design.css @@ -206,30 +206,44 @@ #dokuwiki__pagetools ul li a.edit:focus { background-image: url(images/pagetools/edit-active.png); } + #dokuwiki__pagetools ul li a.show { - background-image: url(images/pagetools/page.png); + background-image: url(images/pagetools/show.png); } -#dokuwiki__pagetools ul li a.create { - background-image: url(images/pagetools/pencil_add.png); +#dokuwiki__pagetools ul li a.show:hover, +#dokuwiki__pagetools ul li a.show:active, +#dokuwiki__pagetools ul li a.show:focus { + background-image: url(images/pagetools/show-active.png); } + #dokuwiki__pagetools ul li a.source { - background-image: url(images/pagetools/page_code.png); + background-image: url(images/pagetools/source.png); +} +#dokuwiki__pagetools ul li a.source:hover, +#dokuwiki__pagetools ul li a.source:active, +#dokuwiki__pagetools ul li a.source:focus { + background-image: url(images/pagetools/source-active.png); } + #dokuwiki__pagetools ul li a.draft { - background-image: url(images/pagetools/inbox-document-text.png); + background-image: url(images/pagetools/draft.png); } -#dokuwiki__pagetools ul li a.revert { - background-image: url(images/pagetools/site_backup_and_restore.png); +#dokuwiki__pagetools ul li a.draft:hover, +#dokuwiki__pagetools ul li a.draft:active, +#dokuwiki__pagetools ul li a.draft:focus { + background-image: url(images/pagetools/draft-active.png); } + #dokuwiki__pagetools ul li a.revs { - background-image: url(images/pagetools/revs.png); + background-image: url(images/pagetools/revisions.png); } #dokuwiki__pagetools ul li a.revs:hover, #dokuwiki__pagetools ul li a.revs:active, #dokuwiki__pagetools ul li a.revs:focus, .mode_revisions #dokuwiki__pagetools ul li a.revs { - background-image: url(images/pagetools/revs-active.png); + background-image: url(images/pagetools/revisions-active.png); } + #dokuwiki__pagetools ul li a.backlink { background-image: url(images/pagetools/backlink.png); } @@ -239,9 +253,7 @@ .mode_backlink #dokuwiki__pagetools ul li a.backlink { background-image: url(images/pagetools/backlink-active.png); } -#dokuwiki__pagetools ul li a.subscribe { - background-image: url(images/pagetools/email_star.png); -} + #dokuwiki__pagetools ul li a.top { background-image: url(images/pagetools/top.png); } @@ -251,6 +263,25 @@ background-image: url(images/pagetools/top-active.png); } +#dokuwiki__pagetools ul li a.revert { + background-image: url(images/pagetools/revert.png); +} +#dokuwiki__pagetools ul li a.revert:hover, +#dokuwiki__pagetools ul li a.revert:active, +#dokuwiki__pagetools ul li a.revert:focus, +.mode_revert #dokuwiki__pagetools ul li a.revert { + background-image: url(images/pagetools/revert-active.png); +} + +#dokuwiki__pagetools ul li a.subscribe { + background-image: url(images/pagetools/subscribe.png); +} +#dokuwiki__pagetools ul li a.subscribe:hover, +#dokuwiki__pagetools ul li a.subscribe:active, +#dokuwiki__pagetools ul li a.subscribe:focus, +.mode_subscribe #dokuwiki__pagetools ul li a.subscribe { + background-image: url(images/pagetools/subscribe-active.png); +} /*____________ site tools ____________*/ diff --git a/images/pagetools/arrow_redo.png b/images/pagetools/arrow_redo.png deleted file mode 100644 index fdc394c7c..000000000 Binary files a/images/pagetools/arrow_redo.png and /dev/null differ diff --git a/images/pagetools/arrow_up.png b/images/pagetools/arrow_up.png deleted file mode 100644 index 1ebb19324..000000000 Binary files a/images/pagetools/arrow_up.png and /dev/null differ diff --git a/images/pagetools/backlink-active.png b/images/pagetools/backlink-active.png index 9038de35b..85ef7b810 100644 Binary files a/images/pagetools/backlink-active.png and b/images/pagetools/backlink-active.png differ diff --git a/images/pagetools/backlink.png b/images/pagetools/backlink.png index 82bc7fd8a..ef173bbf1 100644 Binary files a/images/pagetools/backlink.png and b/images/pagetools/backlink.png differ diff --git a/images/pagetools/create-active.png b/images/pagetools/create-active.png new file mode 100644 index 000000000..c7ede442e Binary files /dev/null and b/images/pagetools/create-active.png differ diff --git a/images/pagetools/create.png b/images/pagetools/create.png new file mode 100644 index 000000000..46e1c4fcc Binary files /dev/null and b/images/pagetools/create.png differ diff --git a/images/pagetools/edit-active.png b/images/pagetools/edit-active.png index 57c9c63f8..31740052e 100644 Binary files a/images/pagetools/edit-active.png and b/images/pagetools/edit-active.png differ diff --git a/images/pagetools/edit.png b/images/pagetools/edit.png index 572a379b4..1f266a410 100644 Binary files a/images/pagetools/edit.png and b/images/pagetools/edit.png differ diff --git a/images/pagetools/email_star.png b/images/pagetools/email_star.png deleted file mode 100644 index 82608102e..000000000 Binary files a/images/pagetools/email_star.png and /dev/null differ diff --git a/images/pagetools/inbox-document-text.png b/images/pagetools/inbox-document-text.png deleted file mode 100644 index f56c8e47c..000000000 Binary files a/images/pagetools/inbox-document-text.png and /dev/null differ diff --git a/images/pagetools/page.png b/images/pagetools/page.png deleted file mode 100644 index 03ddd799f..000000000 Binary files a/images/pagetools/page.png and /dev/null differ diff --git a/images/pagetools/page_code.png b/images/pagetools/page_code.png deleted file mode 100644 index f7ea90419..000000000 Binary files a/images/pagetools/page_code.png and /dev/null differ diff --git a/images/pagetools/pagetools.xcf b/images/pagetools/pagetools.xcf new file mode 100644 index 000000000..2f534a6e7 Binary files /dev/null and b/images/pagetools/pagetools.xcf differ diff --git a/images/pagetools/pencil.png b/images/pagetools/pencil.png deleted file mode 100644 index 0bfecd50e..000000000 Binary files a/images/pagetools/pencil.png and /dev/null differ diff --git a/images/pagetools/pencil_add.png b/images/pagetools/pencil_add.png deleted file mode 100644 index edbebeed0..000000000 Binary files a/images/pagetools/pencil_add.png and /dev/null differ diff --git a/images/pagetools/revert-active.png b/images/pagetools/revert-active.png new file mode 100644 index 000000000..84422f985 Binary files /dev/null and b/images/pagetools/revert-active.png differ diff --git a/images/pagetools/revert.png b/images/pagetools/revert.png new file mode 100644 index 000000000..03ab808f8 Binary files /dev/null and b/images/pagetools/revert.png differ diff --git a/images/pagetools/revisions-active.png b/images/pagetools/revisions-active.png new file mode 100644 index 000000000..3ff7252c0 Binary files /dev/null and b/images/pagetools/revisions-active.png differ diff --git a/images/pagetools/revisions.png b/images/pagetools/revisions.png new file mode 100644 index 000000000..48d47c524 Binary files /dev/null and b/images/pagetools/revisions.png differ diff --git a/images/pagetools/revs-active.png b/images/pagetools/revs-active.png deleted file mode 100644 index 58ecaa021..000000000 Binary files a/images/pagetools/revs-active.png and /dev/null differ diff --git a/images/pagetools/revs.png b/images/pagetools/revs.png deleted file mode 100644 index 225daaf13..000000000 Binary files a/images/pagetools/revs.png and /dev/null differ diff --git a/images/pagetools/show-active.png b/images/pagetools/show-active.png new file mode 100644 index 000000000..9347bca1d Binary files /dev/null and b/images/pagetools/show-active.png differ diff --git a/images/pagetools/show.png b/images/pagetools/show.png new file mode 100644 index 000000000..3aedef4e5 Binary files /dev/null and b/images/pagetools/show.png differ diff --git a/images/pagetools/site_backup_and_restore.png b/images/pagetools/site_backup_and_restore.png deleted file mode 100644 index 467e441b0..000000000 Binary files a/images/pagetools/site_backup_and_restore.png and /dev/null differ diff --git a/images/pagetools/source-active.png b/images/pagetools/source-active.png new file mode 100644 index 000000000..c5b000237 Binary files /dev/null and b/images/pagetools/source-active.png differ diff --git a/images/pagetools/source.png b/images/pagetools/source.png new file mode 100644 index 000000000..bdf38ae95 Binary files /dev/null and b/images/pagetools/source.png differ diff --git a/images/pagetools/subscribe-active.png b/images/pagetools/subscribe-active.png new file mode 100644 index 000000000..aef1d0f44 Binary files /dev/null and b/images/pagetools/subscribe-active.png differ diff --git a/images/pagetools/subscribe.png b/images/pagetools/subscribe.png new file mode 100644 index 000000000..a6db22ccd Binary files /dev/null and b/images/pagetools/subscribe.png differ diff --git a/images/pagetools/time.png b/images/pagetools/time.png deleted file mode 100644 index 911da3f1d..000000000 Binary files a/images/pagetools/time.png and /dev/null differ diff --git a/images/pagetools/top-active.png b/images/pagetools/top-active.png index 9553896f2..c95789b55 100644 Binary files a/images/pagetools/top-active.png and b/images/pagetools/top-active.png differ diff --git a/images/pagetools/top.png b/images/pagetools/top.png index 82d6a8c06..3f37f5290 100644 Binary files a/images/pagetools/top.png and b/images/pagetools/top.png differ -- cgit v1.2.3 From e508fd27e16875751c0e4054f5d02bd046bdb612 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Thu, 5 Jan 2012 00:07:59 +0000 Subject: show sidebar only when it exists and in show mode (fixes #3 and #4) --- css/structure.css | 18 ++---------------- main.php | 13 ++++++++----- 2 files changed, 10 insertions(+), 21 deletions(-) diff --git a/css/structure.css b/css/structure.css index 19f351620..4e3a14be8 100755 --- a/css/structure.css +++ b/css/structure.css @@ -42,29 +42,15 @@ body { margin: 0 1.5em 0 0; } - #dokuwiki__content { + .hasSidebar #dokuwiki__content { float: right; margin-left: -__sidebar_width__; width: 100%; } - #dokuwiki__content .pad { + .hasSidebar #dokuwiki__content .pad { margin-left: __sidebar_width__; } - /* don't show sidebar with fullscreen media manager or in the admin */ - .mode_media #dokuwiki__aside, - .mode_admin #dokuwiki__aside { - display: none; - } - .mode_media #dokuwiki__content, - .mode_media #dokuwiki__content .pad, - .mode_admin #dokuwiki__content, - .mode_admin #dokuwiki__content .pad { - float: none; - margin-left: 0; - margin-right: 0; - } - #dokuwiki__footer { clear: both; } diff --git a/main.php b/main.php index 0a0765065..e5552215d 100755 --- a/main.php +++ b/main.php @@ -12,6 +12,7 @@ if (!defined('DOKU_INC')) die(); /* must be run from within DokuWiki */ @require_once(dirname(__FILE__).'/tpl_functions.php'); /* include hook for template functions */ $showTools = !tpl_getConf('hideTools') || ( tpl_getConf('hideTools') && $_SERVER['REMOTE_USER'] ); +$showSidebar = tpl_getConf('sidebarID') && page_exists(tpl_getConf('sidebarID')) && ($ACT=='show'); ?> are added to make it possible to e.g. style a page differently if it's in edit mode, see http://www.dokuwiki.org/devel:action_modes for a list of action modes */ ?> -
+
@@ -109,10 +110,12 @@ $showTools = !tpl_getConf('hideTools') || ( tpl_getConf('hideTools') && $_SERVER
- -
- -
+ + +
+ +
+
-- cgit v1.2.3 From 516246fc4f6162703877f779e611d06c002ca257 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Thu, 5 Jan 2012 00:08:25 +0000 Subject: RTL styling fixes --- css/rtl.css | 47 +++++++++++++++++++++++++++++++++++++---------- 1 file changed, 37 insertions(+), 10 deletions(-) diff --git a/css/rtl.css b/css/rtl.css index 8b82a45e1..5b6fa28bb 100755 --- a/css/rtl.css +++ b/css/rtl.css @@ -37,48 +37,75 @@ caption, legend { #dokuwiki__header .headings { float: right; + text-align: right; } #dokuwiki__header .tools { float: left; text-align: left; } -.mode_show #dokuwiki__aside { +#dokuwiki__aside { float: right; } #dokuwiki__aside .pad { margin: 0 0 0 1.5em; } -.mode_show #dokuwiki__content { +.hasSidebar #dokuwiki__content { float: left; margin-left: 0; margin-right: -__sidebar_width__; } -.mode_show #dokuwiki__content .pad { +.hasSidebar #dokuwiki__content .pad { margin-left: 0; margin-right: __sidebar_width__; } /*____________ design ____________*/ -#dokuwiki__header form.search #qsearch__in { - margin-right: 0; +#dokuwiki__header h1 img { + float: right; margin-left: .5em; + margin-right: 0; } -#dokuwiki__usertools ul li.user { - float: right; - margin-right: 0; +#dokuwiki__sitetools form.search input.edit { + padding: .35em .1em .35em 22px; } -#dokuwiki__pagetools ul li a.action.top { - float: left; +#dokuwiki__sitetools form.search input.button { + background-position: 5px 0; + margin-left: 0; + margin-right: -20px; +} + +#dokuwiki__usertools { + text-align: left; + left: 40px; + right: auto; +} + +#dokuwiki__sitetools { + text-align: left; } #dokuwiki__aside ul, #dokuwiki__aside ol { padding-right: 0; } +.dokuwiki .pageId { + right: auto; + left: -1em; +} + +.dokuwiki .docInfo { + text-align: left; +} + + +#dokuwiki__footer .license img { + margin: 0 0 0 .5em; +} + /*____________ content ____________*/ /* section indenting -- cgit v1.2.3 From 5a94948e33fad32dd2def12f6d379a0aefe1c5e9 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Thu, 5 Jan 2012 01:23:51 +0000 Subject: make too wide content fit (fixes #7) --- css/basic.css | 3 +++ css/design.css | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/css/basic.css b/css/basic.css index 2ad21b6ca..793f5cca0 100755 --- a/css/basic.css +++ b/css/basic.css @@ -168,6 +168,9 @@ img { background-color: transparent; font-style: italic; } +img, object { + max-width: 100%; +} hr { border-top: solid __border__; diff --git a/css/design.css b/css/design.css index 388e50fc6..eb1166b88 100755 --- a/css/design.css +++ b/css/design.css @@ -327,6 +327,8 @@ #dokuwiki__aside .pad { line-height: 1.2; font-size: 0.875em; + overflow: hidden; + word-wrap: break-word; } /* make sidebar more condensed */ @@ -388,6 +390,8 @@ border-radius: 2px; padding: 2em; margin-bottom: .5em; + overflow: hidden; + word-wrap: break-word; } .dokuwiki .docInfo { -- cgit v1.2.3 From 0ecb8d8d9337ca465b4aeb95d0947e08401315de Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Thu, 5 Jan 2012 01:26:44 +0000 Subject: changed some 'div.dokuwiki' to '.dokuwiki' --- css/_forms.css | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/css/_forms.css b/css/_forms.css index c7dc02d62..804584725 100755 --- a/css/_forms.css +++ b/css/_forms.css @@ -13,32 +13,32 @@ /* ---------------- forms ------------------------ */ -div.dokuwiki form { +.dokuwiki form { border: none; display: inline; } -div.dokuwiki label.block { +.dokuwiki label.block { display: block; text-align: right; font-weight: bold; } -div.dokuwiki label.simple { +.dokuwiki label.simple { display: block; text-align: left; font-weight: normal; } -div.dokuwiki label.block input.edit { +.dokuwiki label.block input.edit { width: 50%; } -div.dokuwiki label span { +.dokuwiki label span { vertical-align: middle; } -div.dokuwiki fieldset { +.dokuwiki fieldset { width: 400px; text-align: center; border: 1px solid __border__; @@ -47,11 +47,11 @@ div.dokuwiki fieldset { } -div.dokuwiki input.edit, -div.dokuwiki select.edit { +.dokuwiki input.edit, +.dokuwiki select.edit { vertical-align: middle; } -div.dokuwiki select.edit { +.dokuwiki select.edit { padding: 0.1em 0; } -- cgit v1.2.3 From 9a2e250ac50cb5571b81b8d005a1f1edf7b8e17f Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Sat, 7 Jan 2012 14:11:47 +0100 Subject: make sure that sidebar TOCs won't interfere with page TOCs This could happen if a sidebar is rendered before the page (populating $TOC) and the page itself had no own TOC (no headers). --- inc/template.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/inc/template.php b/inc/template.php index c70e407d6..476ef74a3 100644 --- a/inc/template.php +++ b/inc/template.php @@ -1354,9 +1354,12 @@ function tpl_license($img='badge',$imgonly=false,$return=false){ */ function tpl_include_page($pageid,$print=true){ global $ID; - $oldid = $ID; + global $TOC; + $oldid = $ID; + $oldtoc = $TOC; $html = p_wiki_xhtml($pageid,'',false); - $ID = $oldid; + $ID = $oldid; + $TOC = $oldtoc; if(!$print) return $html; echo $html; -- cgit v1.2.3 From 3d7fb39fd124400143b9fd776ad009233e42101b Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Thu, 5 Jan 2012 00:07:59 +0000 Subject: show sidebar only when it exists and in show mode (fixes #3 and #4) --- css/structure.css | 18 ++---------------- main.php | 13 ++++++++----- 2 files changed, 10 insertions(+), 21 deletions(-) diff --git a/css/structure.css b/css/structure.css index 19f351620..4e3a14be8 100755 --- a/css/structure.css +++ b/css/structure.css @@ -42,29 +42,15 @@ body { margin: 0 1.5em 0 0; } - #dokuwiki__content { + .hasSidebar #dokuwiki__content { float: right; margin-left: -__sidebar_width__; width: 100%; } - #dokuwiki__content .pad { + .hasSidebar #dokuwiki__content .pad { margin-left: __sidebar_width__; } - /* don't show sidebar with fullscreen media manager or in the admin */ - .mode_media #dokuwiki__aside, - .mode_admin #dokuwiki__aside { - display: none; - } - .mode_media #dokuwiki__content, - .mode_media #dokuwiki__content .pad, - .mode_admin #dokuwiki__content, - .mode_admin #dokuwiki__content .pad { - float: none; - margin-left: 0; - margin-right: 0; - } - #dokuwiki__footer { clear: both; } diff --git a/main.php b/main.php index 0a0765065..e5552215d 100755 --- a/main.php +++ b/main.php @@ -12,6 +12,7 @@ if (!defined('DOKU_INC')) die(); /* must be run from within DokuWiki */ @require_once(dirname(__FILE__).'/tpl_functions.php'); /* include hook for template functions */ $showTools = !tpl_getConf('hideTools') || ( tpl_getConf('hideTools') && $_SERVER['REMOTE_USER'] ); +$showSidebar = tpl_getConf('sidebarID') && page_exists(tpl_getConf('sidebarID')) && ($ACT=='show'); ?> are added to make it possible to e.g. style a page differently if it's in edit mode, see http://www.dokuwiki.org/devel:action_modes for a list of action modes */ ?> -
+
@@ -109,10 +110,12 @@ $showTools = !tpl_getConf('hideTools') || ( tpl_getConf('hideTools') && $_SERVER
- -
- -
+ + +
+ +
+
-- cgit v1.2.3 From faefe2d963001701e6424e59b5423fb22d071808 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Thu, 5 Jan 2012 00:08:25 +0000 Subject: RTL styling fixes --- css/rtl.css | 47 +++++++++++++++++++++++++++++++++++++---------- 1 file changed, 37 insertions(+), 10 deletions(-) diff --git a/css/rtl.css b/css/rtl.css index 8b82a45e1..5b6fa28bb 100755 --- a/css/rtl.css +++ b/css/rtl.css @@ -37,48 +37,75 @@ caption, legend { #dokuwiki__header .headings { float: right; + text-align: right; } #dokuwiki__header .tools { float: left; text-align: left; } -.mode_show #dokuwiki__aside { +#dokuwiki__aside { float: right; } #dokuwiki__aside .pad { margin: 0 0 0 1.5em; } -.mode_show #dokuwiki__content { +.hasSidebar #dokuwiki__content { float: left; margin-left: 0; margin-right: -__sidebar_width__; } -.mode_show #dokuwiki__content .pad { +.hasSidebar #dokuwiki__content .pad { margin-left: 0; margin-right: __sidebar_width__; } /*____________ design ____________*/ -#dokuwiki__header form.search #qsearch__in { - margin-right: 0; +#dokuwiki__header h1 img { + float: right; margin-left: .5em; + margin-right: 0; } -#dokuwiki__usertools ul li.user { - float: right; - margin-right: 0; +#dokuwiki__sitetools form.search input.edit { + padding: .35em .1em .35em 22px; } -#dokuwiki__pagetools ul li a.action.top { - float: left; +#dokuwiki__sitetools form.search input.button { + background-position: 5px 0; + margin-left: 0; + margin-right: -20px; +} + +#dokuwiki__usertools { + text-align: left; + left: 40px; + right: auto; +} + +#dokuwiki__sitetools { + text-align: left; } #dokuwiki__aside ul, #dokuwiki__aside ol { padding-right: 0; } +.dokuwiki .pageId { + right: auto; + left: -1em; +} + +.dokuwiki .docInfo { + text-align: left; +} + + +#dokuwiki__footer .license img { + margin: 0 0 0 .5em; +} + /*____________ content ____________*/ /* section indenting -- cgit v1.2.3 From cd6a1470058700ab34d11f7c701304873100256e Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Thu, 5 Jan 2012 01:23:51 +0000 Subject: make too wide content fit (fixes #7) --- css/basic.css | 3 +++ css/design.css | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/css/basic.css b/css/basic.css index 2ad21b6ca..793f5cca0 100755 --- a/css/basic.css +++ b/css/basic.css @@ -168,6 +168,9 @@ img { background-color: transparent; font-style: italic; } +img, object { + max-width: 100%; +} hr { border-top: solid __border__; diff --git a/css/design.css b/css/design.css index f798b03cc..f75df1140 100755 --- a/css/design.css +++ b/css/design.css @@ -358,6 +358,8 @@ #dokuwiki__aside .pad { line-height: 1.2; font-size: 0.875em; + overflow: hidden; + word-wrap: break-word; } /* make sidebar more condensed */ @@ -419,6 +421,8 @@ border-radius: 2px; padding: 2em; margin-bottom: .5em; + overflow: hidden; + word-wrap: break-word; } .dokuwiki .docInfo { -- cgit v1.2.3 From 51152ba0d3fcb30765fdbe1c949b9663094b17a9 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Thu, 5 Jan 2012 01:26:44 +0000 Subject: changed some 'div.dokuwiki' to '.dokuwiki' --- css/_forms.css | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/css/_forms.css b/css/_forms.css index c7dc02d62..804584725 100755 --- a/css/_forms.css +++ b/css/_forms.css @@ -13,32 +13,32 @@ /* ---------------- forms ------------------------ */ -div.dokuwiki form { +.dokuwiki form { border: none; display: inline; } -div.dokuwiki label.block { +.dokuwiki label.block { display: block; text-align: right; font-weight: bold; } -div.dokuwiki label.simple { +.dokuwiki label.simple { display: block; text-align: left; font-weight: normal; } -div.dokuwiki label.block input.edit { +.dokuwiki label.block input.edit { width: 50%; } -div.dokuwiki label span { +.dokuwiki label span { vertical-align: middle; } -div.dokuwiki fieldset { +.dokuwiki fieldset { width: 400px; text-align: center; border: 1px solid __border__; @@ -47,11 +47,11 @@ div.dokuwiki fieldset { } -div.dokuwiki input.edit, -div.dokuwiki select.edit { +.dokuwiki input.edit, +.dokuwiki select.edit { vertical-align: middle; } -div.dokuwiki select.edit { +.dokuwiki select.edit { padding: 0.1em 0; } -- cgit v1.2.3 From 1204c0aadca651804aa56b88e9f9d4fa156e7445 Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Sun, 8 Jan 2012 12:48:54 +0100 Subject: fixed icons for create and draft --- css/design.css | 9 +++++++++ images/pagetools/draft-active.png | Bin 0 -> 988 bytes images/pagetools/draft.png | Bin 0 -> 935 bytes images/pagetools/pagetools.xcf | Bin 11966 -> 13291 bytes 4 files changed, 9 insertions(+) create mode 100644 images/pagetools/draft-active.png create mode 100644 images/pagetools/draft.png diff --git a/css/design.css b/css/design.css index f75df1140..d32bc711b 100755 --- a/css/design.css +++ b/css/design.css @@ -207,6 +207,15 @@ background-image: url(images/pagetools/edit-active.png); } +#dokuwiki__pagetools ul li a.create { + background-image: url(images/pagetools/create.png); +} +#dokuwiki__pagetools ul li a.create:hover, +#dokuwiki__pagetools ul li a.create:active, +#dokuwiki__pagetools ul li a.create:focus { + background-image: url(images/pagetools/create-active.png); +} + #dokuwiki__pagetools ul li a.show { background-image: url(images/pagetools/show.png); } diff --git a/images/pagetools/draft-active.png b/images/pagetools/draft-active.png new file mode 100644 index 000000000..e4c0a6c72 Binary files /dev/null and b/images/pagetools/draft-active.png differ diff --git a/images/pagetools/draft.png b/images/pagetools/draft.png new file mode 100644 index 000000000..d44cc8c3f Binary files /dev/null and b/images/pagetools/draft.png differ diff --git a/images/pagetools/pagetools.xcf b/images/pagetools/pagetools.xcf index 2f534a6e7..ab4eaf634 100644 Binary files a/images/pagetools/pagetools.xcf and b/images/pagetools/pagetools.xcf differ -- cgit v1.2.3 From c4ec01d679a5badc56ac8315eb279fb8f98698b6 Mon Sep 17 00:00:00 2001 From: "Oscar M. Lage" Date: Sun, 8 Jan 2012 12:57:37 +0100 Subject: Spanish language update --- inc/lang/es/lang.php | 4 ++-- lib/plugins/config/lang/es/lang.php | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/inc/lang/es/lang.php b/inc/lang/es/lang.php index 5164c3243..7d365bfbe 100644 --- a/inc/lang/es/lang.php +++ b/inc/lang/es/lang.php @@ -282,9 +282,9 @@ $lang['i_enableacl'] = 'Habilitar ACL (recomendado) (ACL: lista de con $lang['i_superuser'] = 'Super-usuario'; $lang['i_problems'] = 'El instalador encontró algunos problemas, se muestran abajo. No se puede continuar la instalación hasta que usted no los corrija.'; $lang['i_modified'] = 'Por razones de seguridad este script sólo funcionará con una instalación nueva y no modificada de Dokuwiki. Usted debe extraer nuevamente los ficheros del paquete bajado, o bien consultar las instrucciones de instalación de Dokuwiki completas.'; -$lang['i_funcna'] = 'La función de PHP %s no está disponible. Tal vez su proveedor de hosting la ha deshabilitado por alguna razón?'; +$lang['i_funcna'] = 'La función de PHP %s no está disponible. ¿Tal vez su proveedor de hosting la ha deshabilitado por alguna razón?'; $lang['i_phpver'] = 'Su versión de PHP %s es menor que la necesaria %s. Es necesario que actualice su instalación de PHP.'; -$lang['i_permfail'] = 'DokuWili no puede escribir %s. Es necesario establecer correctamente los permisos de este directorio!'; +$lang['i_permfail'] = 'DokuWili no puede escribir %s. ¡Es necesario establecer correctamente los permisos de este directorio!'; $lang['i_confexists'] = '%s ya existe'; $lang['i_writeerr'] = 'Imposible crear %s. Se necesita que usted controle los permisos del fichero/directorio y que cree el fichero manualmente.'; $lang['i_badhash'] = 'dokuwiki.php no reconocido o modificado (hash=%s)'; diff --git a/lib/plugins/config/lang/es/lang.php b/lib/plugins/config/lang/es/lang.php index 1189a6781..9146633cf 100644 --- a/lib/plugins/config/lang/es/lang.php +++ b/lib/plugins/config/lang/es/lang.php @@ -80,6 +80,7 @@ $lang['useheading'] = 'Usar el primer encabezado para nombres de pág $lang['refcheck'] = 'Control de referencia a medios'; $lang['refshow'] = 'Número de referencias a medios a mostrar'; $lang['allowdebug'] = 'Permitir debug deshabilítelo si no lo necesita!'; +$lang['mediarevisions'] = '¿Habilitar Mediarevisions?'; $lang['usewordblock'] = 'Bloquear spam usando una lista de palabras'; $lang['indexdelay'] = 'Intervalo de tiempo antes de indexar (segundos)'; $lang['relnofollow'] = 'Usar rel="nofollow" en enlaces externos'; @@ -132,14 +133,14 @@ $lang['hidepages'] = 'Ocultar páginas con coincidencias (expresione $lang['send404'] = 'Enviar "HTTP 404/Page Not Found" para páginas no existentes'; $lang['sitemap'] = 'Generar sitemap de Google (días)'; $lang['broken_iua'] = '¿Se ha roto (broken) la función ignore_user_abort en su sistema? Esto puede causar que no funcione el index de búsqueda. Se sabe que IIS+PHP/CGI está roto. Vea Bug 852para más información.'; -$lang['xsendfile'] = 'Utilice el X-Sendfile header para permitirle sl servidor web enviar archivos estáticos? Su servidor web necesita tener la capacidad para hacerlo.'; +$lang['xsendfile'] = '¿Utilizar la cabecera X-Sendfile para permitirle al servidor web enviar archivos estáticos? Su servidor web necesita tener la capacidad para hacerlo.'; $lang['renderer_xhtml'] = 'Visualizador a usar para salida (xhtml) principal del wiki'; $lang['renderer__core'] = '%s (núcleo dokuwiki)'; $lang['renderer__plugin'] = '%s (plugin)'; $lang['rememberme'] = 'Permitir cookies para acceso permanente (recordarme)'; $lang['rss_type'] = 'Tipo de resumen (feed) XML'; $lang['rss_linkto'] = 'Feed XML enlaza a'; -$lang['rss_content'] = 'Que mostrar en los itemes del archivo XML?'; +$lang['rss_content'] = '¿Qué mostrar en los items del archivo XML?'; $lang['rss_update'] = 'Intervalo de actualización de feed XML (segundos)'; $lang['recent_days'] = 'Cuántos cambios recientes mantener (días)'; $lang['rss_show_summary'] = 'Feed XML muestra el resumen en el título'; -- cgit v1.2.3 From eb20307ad68614b8834c804eeade389967db5ed4 Mon Sep 17 00:00:00 2001 From: Dominik Eckelmann Date: Sun, 8 Jan 2012 14:38:52 +0100 Subject: removed xmlrpc and xmlrpcuser - added remote and remoteuser config option --- conf/dokuwiki.php | 4 ++-- lib/plugins/config/lang/ar/lang.php | 2 -- lib/plugins/config/lang/bg/lang.php | 2 -- lib/plugins/config/lang/ca-valencia/lang.php | 2 -- lib/plugins/config/lang/ca/lang.php | 2 -- lib/plugins/config/lang/cs/lang.php | 2 -- lib/plugins/config/lang/da/lang.php | 2 -- lib/plugins/config/lang/de-informal/lang.php | 2 -- lib/plugins/config/lang/de/lang.php | 2 -- lib/plugins/config/lang/el/lang.php | 4 +--- lib/plugins/config/lang/en/lang.php | 4 ++-- lib/plugins/config/lang/eo/lang.php | 2 -- lib/plugins/config/lang/es/lang.php | 2 -- lib/plugins/config/lang/eu/lang.php | 2 -- lib/plugins/config/lang/fa/lang.php | 2 -- lib/plugins/config/lang/fi/lang.php | 2 -- lib/plugins/config/lang/fr/lang.php | 2 -- lib/plugins/config/lang/gl/lang.php | 2 -- lib/plugins/config/lang/he/lang.php | 1 - lib/plugins/config/lang/hu/lang.php | 2 -- lib/plugins/config/lang/ia/lang.php | 2 -- lib/plugins/config/lang/id-ni/lang.php | 1 - lib/plugins/config/lang/it/lang.php | 2 -- lib/plugins/config/lang/ja/lang.php | 2 -- lib/plugins/config/lang/ko/lang.php | 2 -- lib/plugins/config/lang/la/lang.php | 2 -- lib/plugins/config/lang/lv/lang.php | 2 -- lib/plugins/config/lang/mr/lang.php | 2 -- lib/plugins/config/lang/nl/lang.php | 2 -- lib/plugins/config/lang/no/lang.php | 3 --- lib/plugins/config/lang/pl/lang.php | 2 -- lib/plugins/config/lang/pt-br/lang.php | 2 -- lib/plugins/config/lang/pt/lang.php | 2 -- lib/plugins/config/lang/ro/lang.php | 2 -- lib/plugins/config/lang/ru/lang.php | 2 -- lib/plugins/config/lang/sk/lang.php | 2 -- lib/plugins/config/lang/sl/lang.php | 2 -- lib/plugins/config/lang/sq/lang.php | 2 -- lib/plugins/config/lang/sr/lang.php | 2 -- lib/plugins/config/lang/sv/lang.php | 2 -- lib/plugins/config/lang/th/lang.php | 1 - lib/plugins/config/lang/uk/lang.php | 2 -- lib/plugins/config/lang/zh-tw/lang.php | 2 -- lib/plugins/config/lang/zh/lang.php | 2 -- lib/plugins/config/settings/config.metadata.php | 4 ++-- 45 files changed, 7 insertions(+), 89 deletions(-) diff --git a/conf/dokuwiki.php b/conf/dokuwiki.php index 298c8e572..4238f7e53 100644 --- a/conf/dokuwiki.php +++ b/conf/dokuwiki.php @@ -78,8 +78,8 @@ $conf['sneaky_index'] = 0; //check for namespace read permission i $conf['auth_security_timeout'] = 900; //time (seconds) auth data is considered valid, set to 0 to recheck on every page view $conf['securecookie'] = 1; //never send HTTPS cookies via HTTP -$conf['xmlrpc'] = 0; //Enable/disable XML-RPC interface -$conf['xmlrpcuser'] = '!!not set!!'; //Restrict XML-RPC access to this groups/users +$conf['remote'] = 0; //Enable/disable remote interfaces +$conf['remoteuser'] = '!!not set !!'; //user/groups that have access to remote interface (comma separated) /* Advanced Options */ diff --git a/lib/plugins/config/lang/ar/lang.php b/lib/plugins/config/lang/ar/lang.php index 63d258485..3855f4ac1 100644 --- a/lib/plugins/config/lang/ar/lang.php +++ b/lib/plugins/config/lang/ar/lang.php @@ -86,8 +86,6 @@ $lang['disableactions_other'] = 'اجراءات أخرى (مفصولة بالف $lang['sneaky_index'] = 'افتراضيا، ستعرض دوكو ويكي كل اسماء النطاقات في عرض الفهرس. تفعيل هذا الخيار سيخفي مالا يملك المستخدم صلاحية قراءته. قد يؤدي هذا إلى اخفاء نطاقات فرعية متاحة. وقد يؤدي لجعل صفحة الفهرس معطلة في بعض اعدادات ACL.'; $lang['auth_security_timeout'] = 'زمن انتهاء أمان المواثقة (ثوان)'; $lang['securecookie'] = 'هل يفرض على كعكات التصفح المعدة عبر HTTPS ان ترسل فقط عبر HTTPS من قبل المتصفح؟ عطل هذا إن كان الولوج للويكي مؤمنا فقط عبر SSL لكن تصفح الويكي غير مؤمن.'; -$lang['xmlrpc'] = 'مكّن/عطل واجهة XML-RPC.'; -$lang['xmlrpcuser'] = 'احصر الوصول لـ XML-RPC بمستخدمين أو مجموعات مفصولة بالفاصلة هنا. اتركها فارغة لتمكين الوصول للجميع.'; $lang['updatecheck'] = 'تحقق من التحديثات و تنبيهات الأمان؟ دوكو ويكي ستحتاج للاتصال ب update.dokuwiki.org لأجل ذلك'; $lang['userewrite'] = 'استعمل عناوين URLs جميلة'; $lang['useslash'] = 'استخدم الشرطة كفاصل النطاق في العناوين'; diff --git a/lib/plugins/config/lang/bg/lang.php b/lib/plugins/config/lang/bg/lang.php index ff03fd9e2..8f61e96c0 100644 --- a/lib/plugins/config/lang/bg/lang.php +++ b/lib/plugins/config/lang/bg/lang.php @@ -88,8 +88,6 @@ $lang['sneaky_index'] = 'Стандартно DokuWiki ще показ $lang['auth_security_timeout'] = 'Автоматично проверяване на удостоверяването всеки (сек)'; $lang['securecookie'] = 'Да се изпращат ли бисквитките зададени чрез HTTPS, само чрез HTTPS от браузъра? Изключете опцията, когато SSL се ползва само за вписване, а четенето е без SSL. '; -$lang['xmlrpc'] = 'Включване/Изключване на интерфейса XML-RPC.'; -$lang['xmlrpcuser'] = 'Ограничаване на XML-RPC достъпа до отделени със запетая групи или потребители. Оставете празно, за да даде достъп на всеки.'; $lang['updatecheck'] = 'Проверяване за за нови версии и предупреждения за сигурността? Необходимо е Dokiwiki да може да се свързва със update.dokuwiki.org за тази функционалност.'; $lang['userewrite'] = 'Ползване на nice URL адреси'; $lang['useslash'] = 'Ползване на наклонена черта за разделител на именните пространства в URL'; diff --git a/lib/plugins/config/lang/ca-valencia/lang.php b/lib/plugins/config/lang/ca-valencia/lang.php index 76f11a4a5..4a8c10895 100644 --- a/lib/plugins/config/lang/ca-valencia/lang.php +++ b/lib/plugins/config/lang/ca-valencia/lang.php @@ -86,8 +86,6 @@ $lang['disableactions_other'] = 'Atres accions (separades per comes)'; $lang['sneaky_index'] = 'Normalment, DokuWiki mostra tots els espais de noms en la vista d\'índex. Activant esta opció s\'ocultaran aquells per als que l\'usuari no tinga permís de llectura. Açò pot ocultar subespais accessibles i inutilisar l\'índex per a certes configuracions del ACL.'; $lang['auth_security_timeout'] = 'Temps de seguritat màxim per a l\'autenticació (segons)'; $lang['securecookie'] = '¿El navegador deuria enviar per HTTPS només les galletes que s\'han generat per HTTPS? Desactive esta opció quan utilise SSL només en la pàgina d\'inici de sessió.'; -$lang['xmlrpc'] = 'Activar/desactivar interfaç XML-RPC.'; -$lang['xmlrpcuser'] = 'Restringir l\'accés XML-RPC a la llista d\'usuaris i grups separada per comes definida ací. Deixar buit per a donar accés a tots.'; $lang['updatecheck'] = '¿Buscar actualisacions i advertències de seguritat? DokuWiki necessita conectar a update.dokuwiki.org per ad açò.'; $lang['userewrite'] = 'Utilisar URL millorades'; $lang['useslash'] = 'Utilisar \'/\' per a separar espais de noms en les URL'; diff --git a/lib/plugins/config/lang/ca/lang.php b/lib/plugins/config/lang/ca/lang.php index 1a2a22881..84680450a 100644 --- a/lib/plugins/config/lang/ca/lang.php +++ b/lib/plugins/config/lang/ca/lang.php @@ -86,8 +86,6 @@ $lang['disableactions_other'] = 'Altres accions (separades per comes)'; $lang['sneaky_index'] = 'Per defecte, DokuWiki mostrarà tots els espai en la visualització d\'índex. Si activeu aquest paràmetre, s\'ocultaran aquells espais en els quals l\'usuari no té accés de lectura. Això pot fer que s\'ocultin subespais que sí que són accessibles. En algunes configuracions ACL pot fer que l\'índex resulti inutilitzable.'; $lang['auth_security_timeout'] = 'Temps d\'espera de seguretat en l\'autenticació (segons)'; $lang['securecookie'] = 'Les galetes que s\'han creat via HTTPS, només s\'han d\'enviar des del navegador per HTTPS? Inhabiliteu aquesta opció si només l\'inici de sessió del wiki es fa amb SSL i la navegació del wiki es fa sense seguretat.'; -$lang['xmlrpc'] = 'Habilita/inhabilita la interfície XML-RPC'; -$lang['xmlrpcuser'] = 'Restringeix l\'accés per XML-RPC als usuaris o grups següents, separats per comes. Deixeu aquest camp en blanc per donar accés a tothom.'; $lang['updatecheck'] = 'Comprova actualitzacions i avisos de seguretat. DokuWiki necessitarà contactar amb update.dokuwiki.org per utilitzar aquesta característica.'; $lang['userewrite'] = 'Utilitza URL nets'; $lang['useslash'] = 'Utilitza la barra / com a separador d\'espais en els URL'; diff --git a/lib/plugins/config/lang/cs/lang.php b/lib/plugins/config/lang/cs/lang.php index bf87e99d5..b9e6049a5 100644 --- a/lib/plugins/config/lang/cs/lang.php +++ b/lib/plugins/config/lang/cs/lang.php @@ -99,8 +99,6 @@ To může mít za následek, že index bude při některých nastaveních ACL nepoužitelný.'; $lang['auth_security_timeout'] = 'Časový limit pro autentikaci (v sekundách)'; $lang['securecookie'] = 'Má prohlížeč posílat cookies nastavené přes HTTPS opět jen přes HTTPS? Vypněte tuto volbu, pokud chcete, aby bylo pomocí SSL zabezpečeno pouze přihlašování do wiki, ale obsah budete prohlížet nezabezpečeně.'; -$lang['xmlrpc'] = 'Povolit/Zakázat rozhraní XML-RPC.'; -$lang['xmlrpcuser'] = 'Omezit přístup pomocí XML-RPC pouze na zde zadané skupiny či uživatele (oddělené čárkami). Necháte-li pole prázdné, dáte přístup komukoliv.'; $lang['updatecheck'] = 'Kontrolovat aktualizace a bezpečnostní varování? DokuWiki potřebuje pro tuto funkci přístup k update.dokuwiki.org'; $lang['userewrite'] = 'Používat "pěkná" URL'; $lang['useslash'] = 'Používat lomítko jako oddělovač jmenných prostorů v URL'; diff --git a/lib/plugins/config/lang/da/lang.php b/lib/plugins/config/lang/da/lang.php index a4c0bba75..7e8fe95af 100644 --- a/lib/plugins/config/lang/da/lang.php +++ b/lib/plugins/config/lang/da/lang.php @@ -92,8 +92,6 @@ $lang['disableactions_other'] = 'Andre muligheder (kommasepareret)'; $lang['sneaky_index'] = 'DokuWiki vil som standard vise alle navnerum i indholdsfortegnelsen. Ved at slå denne valgmulighed til vil skjule de navnerum, hvor brugeren ikke har læsetilladelse. Dette kan føre til, at tilgængelige undernavnerum bliver skjult. Ligeledes kan det også gøre indholdsfortegnelsen ubrugelig med visse ACL-opsætninger.'; $lang['auth_security_timeout'] = 'Tidsudløb for bekræftelse (sekunder)'; $lang['securecookie'] = 'Skal datafiler skabt af HTTPS kun sendes af HTTPS gennem browseren? Slå denne valgmulighed fra hvis kun brugen af din wiki er SSL-beskyttet, mens den almindelige tilgang udefra ikke er sikret.'; -$lang['xmlrpc'] = 'Slå XML-RPC-grænseflade til/fra.'; -$lang['xmlrpcuser'] = 'Begræns XML-RPC-adgang til de nævnte og med komma adskilte grupper eller brugere. Lad den stå tom for at give alle adgang.'; $lang['updatecheck'] = 'Kig efter opdateringer og sikkerhedsadvarsler? DokuWiki er nødt til at kontakte update.dokuwiki.org for at tilgå denne funktion.'; $lang['userewrite'] = 'Brug pæne netadresser'; $lang['useslash'] = 'Brug skråstreg som navnerumsdeler i netadresser'; diff --git a/lib/plugins/config/lang/de-informal/lang.php b/lib/plugins/config/lang/de-informal/lang.php index e63735edf..505d71a40 100644 --- a/lib/plugins/config/lang/de-informal/lang.php +++ b/lib/plugins/config/lang/de-informal/lang.php @@ -88,8 +88,6 @@ $lang['disableactions_other'] = 'Weitere Aktionen (durch Komma getrennt)'; $lang['sneaky_index'] = 'Standardmäßig zeigt DokuWiki alle Namensräume in der Indexansicht an. Bei Aktivierung dieser Einstellung werden alle Namensräume versteckt, in welchen der Benutzer keine Leserechte hat. Dies könnte dazu führen, dass lesbare Unternamensräume versteckt werden. Dies kann die Indexansicht bei bestimmten Zugangskontrolleinstellungen unbenutzbar machen.'; $lang['auth_security_timeout'] = 'Zeitüberschreitung bei der Authentifizierung (Sekunden)'; $lang['securecookie'] = 'Sollen Cookies, die via HTTPS gesetzt wurden nur per HTTPS versendet werden? Deaktiviere diese Option, wenn nur der Login deines Wikis mit SSL gesichert ist, aber das Betrachten des Wikis ungesichert geschieht.'; -$lang['xmlrpc'] = 'Aktiviere/Deaktiviere die XML-RPC-Schnittstelle'; -$lang['xmlrpcuser'] = 'XML-RPC-Zugriff auf folgende Gruppen oder Benutzer (kommasepariert) beschränken. Wenn du dieses Feld leer lässt, wir der Zugriff jedem gewährt.'; $lang['updatecheck'] = 'Automatisch auf Updates und Sicherheitswarnungen prüfen? DokuWiki muss sich dafür mit update.dokuwiki.org verbinden.'; $lang['userewrite'] = 'Benutze schöne URLs'; $lang['useslash'] = 'Benutze Schrägstrich als Namensraumtrenner in URLs'; diff --git a/lib/plugins/config/lang/de/lang.php b/lib/plugins/config/lang/de/lang.php index 1fb549597..79c6554e3 100644 --- a/lib/plugins/config/lang/de/lang.php +++ b/lib/plugins/config/lang/de/lang.php @@ -99,8 +99,6 @@ $lang['disableactions_other'] = 'Andere Aktionen (durch Komma getrennt)'; $lang['sneaky_index'] = 'Standardmäßig zeigt DokuWiki alle Namensräume in der Übersicht. Wenn diese Option aktiviert wird, werden alle Namensräume, für die der Benutzer keine Lese-Rechte hat, nicht angezeigt. Dies kann unter Umständen dazu führen, das lesbare Unter-Namensräume nicht angezeigt werden und macht die Übersicht evtl. unbrauchbar in Kombination mit bestimmten ACL Einstellungen.'; $lang['auth_security_timeout'] = 'Authentifikations-Timeout (Sekunden)'; $lang['securecookie'] = 'Sollen Cookies, die via HTTPS gesetzt wurden nur per HTTPS versendet werden? Deaktivieren Sie diese Option, wenn nur der Login Ihres Wikis mit SSL gesichert ist, aber das Betrachten des Wikis ungesichert geschieht.'; -$lang['xmlrpc'] = 'XML-RPC-Zugriff erlauben.'; -$lang['xmlrpcuser'] = 'XML-RPC-Zugriff auf folgende Gruppen oder Benutzer (kommasepariert) beschränken. Wenn Sie dieses Feld leer lassen, wir der Zugriff jedem gewährt.'; $lang['updatecheck'] = 'Automatisch auf Updates und Sicherheitswarnungen prüfen? DokuWiki muss sich dafür mit update.dokuwiki.org verbinden.'; $lang['userewrite'] = 'URL rewriting'; $lang['useslash'] = 'Schrägstrich (/) als Namensraumtrenner in URLs verwenden'; diff --git a/lib/plugins/config/lang/el/lang.php b/lib/plugins/config/lang/el/lang.php index 9f5d121de..093212664 100644 --- a/lib/plugins/config/lang/el/lang.php +++ b/lib/plugins/config/lang/el/lang.php @@ -93,8 +93,6 @@ $lang['disableactions_other'] = 'Άλλες λειτουργίες (διαχω $lang['sneaky_index'] = 'Εξ ορισμού, η εφαρμογή DokuWiki δείχνει όλους τους φακέλους στην προβολή Καταλόγου. Ενεργοποιώντας αυτή την επιλογή, δεν θα εμφανίζονται οι φάκελοι για τους οποίους ο χρήστης δεν έχει δικαιώματα ανάγνωσης αλλά και οι υπο-φάκελοί τους ανεξαρτήτως δικαιωμάτων πρόσβασης.'; $lang['auth_security_timeout'] = 'Διάρκεια χρόνου για ασφάλεια πιστοποίησης (δευτερόλεπτα)'; $lang['securecookie'] = 'Τα cookies που έχουν οριστεί μέσω HTTPS πρέπει επίσης να αποστέλλονται μόνο μέσω HTTPS από τον φυλλομετρητή? Απενεργοποιήστε αυτή την επιλογή όταν μόνο η είσοδος στο wiki σας διασφαλίζεται μέσω SSL αλλά η περιήγηση γίνεται και χωρίς αυτό.'; -$lang['xmlrpc'] = 'Ενεργοποίηση/Απενεργοποίηση της διασύνδεσης XML-RPC '; -$lang['xmlrpcuser'] = 'Περιορισμός XML-RPC πρόσβασης στις ομάδες η τους χρήστες (διαχωριζόμενοι με κόμμα). Αφήστε το κενό για πρόσβαση από όλους.'; $lang['updatecheck'] = 'Έλεγχος για ύπαρξη νέων εκδόσεων και ενημερώσεων ασφαλείας της εφαρμογής? Απαιτείται η σύνδεση με το update.dokuwiki.org για να λειτουργήσει σωστά αυτή η επιλογή.'; $lang['userewrite'] = 'Χρήση ωραίων URLs'; $lang['useslash'] = 'Χρήση slash σαν διαχωριστικό φακέλων στα URLs'; @@ -118,7 +116,7 @@ $lang['jpg_quality'] = 'Ποιότητα συμπίεσης JPG (0-100 $lang['subscribers'] = 'Να επιτρέπεται η εγγραφή στην ενημέρωση αλλαγών σελίδας'; $lang['subscribe_time'] = 'Χρόνος μετά τον οποίο οι λίστες ειδοποιήσεων και τα συνοπτικά θα αποστέλλονται (δευτερόλεπτα). Αυτό θα πρέπει να είναι μικρότερο από τον χρόνο που έχει η ρύθμιση recent_days.'; $lang['compress'] = 'Συμπίεση αρχείων CSS και javascript'; -$lang['cssdatauri'] = 'Το μέγεθος σε bytes στο οποίο οι εικόνες που αναφέρονται σε CSS αρχεία θα πρέπει να είναι ενσωματωμένες για τη μείωση των απαιτήσεων μιας κεφαλίδας αίτησης HTTP . Αυτή η τεχνική δεν θα λειτουργήσει σε IE <8! 400 με 600 bytes είναι μια καλή τιμή. Ορίστε την τιμή 0 για να το απενεργοποιήσετε.'; +$lang['cssdatauri'] = 'Το μέγεθος σε bytes στο οποίο οι εικόνες που αναφέρονται σε CSS αρχεία θα πρέπει να είναι ενσωματωμένες για τη μείωση των απαιτήσεων μιας κεφαλίδας αίτησης HTTP . Αυτή η τεχνική δεν θα λειτουργήσει σε IE <8! 400 με 600 bytes είναι μια καλή τιμή. Ορίστε την τιμή 0 για να το απενεργοποιήσετε.'; $lang['hidepages'] = 'Φίλτρο απόκρυψης σελίδων (regular expressions)'; $lang['send404'] = 'Αποστολή "HTTP 404/Page Not Found" για σελίδες που δεν υπάρχουν'; $lang['sitemap'] = 'Δημιουργία Google sitemap (ημέρες)'; diff --git a/lib/plugins/config/lang/en/lang.php b/lib/plugins/config/lang/en/lang.php index 380f2fd1d..27f754c2c 100644 --- a/lib/plugins/config/lang/en/lang.php +++ b/lib/plugins/config/lang/en/lang.php @@ -107,8 +107,8 @@ $lang['disableactions_other'] = 'Other actions (comma separated)'; $lang['sneaky_index'] = 'By default, DokuWiki will show all namespaces in the index view. Enabling this option will hide those where the user doesn\'t have read permissions. This might result in hiding of accessable subnamespaces. This may make the index unusable with certain ACL setups.'; $lang['auth_security_timeout'] = 'Authentication Security Timeout (seconds)'; $lang['securecookie'] = 'Should cookies set via HTTPS only be sent via HTTPS by the browser? Disable this option when only the login of your wiki is secured with SSL but browsing the wiki is done unsecured.'; -$lang['xmlrpc'] = 'Enable/disable XML-RPC interface.'; -$lang['xmlrpcuser'] = 'Restrict XML-RPC access to the comma separated groups or users given here. Leave empty to give access to everyone.'; +$lang['remote'] = 'Enable/disable Remote interface.'; +$lang['remoteuser'] = 'Restrict Remote access to the comma separated groups or users given here. Leave empty to give access to everyone.'; /* Advanced Options */ $lang['updatecheck'] = 'Check for updates and security warnings? DokuWiki needs to contact update.dokuwiki.org for this feature.'; diff --git a/lib/plugins/config/lang/eo/lang.php b/lib/plugins/config/lang/eo/lang.php index b0411ec14..3acb00545 100644 --- a/lib/plugins/config/lang/eo/lang.php +++ b/lib/plugins/config/lang/eo/lang.php @@ -93,8 +93,6 @@ $lang['disableactions_other'] = 'Aliaj agoj (apartite per komoj)'; $lang['sneaky_index'] = 'Apriore, DokuWiki montras ĉiujn nomspacojn en la indeksa modo. Ebligi tiun ĉi elekteblon kaŝus tion, kion la uzanto ne rajtas legi laŭ ACL. Tio povus rezulti ankaŭan kaŝon de alireblaj subnomspacoj. Kaj tiel la indekso estus neuzebla por kelkaj agordoj de ACL.'; $lang['auth_security_timeout'] = 'Sekureca Templimo por aŭtentigo (sekundoj)'; $lang['securecookie'] = 'Ĉu kuketoj difinitaj per HTTPS nur estu senditaj de la foliumilo per HTTPS? Malebligu tiun ĉi opcion kiam nur la ensaluto al via vikio estas sekurigita per SSL, sed foliumado de la vikio estas farita malsekure.'; -$lang['xmlrpc'] = 'Ebligi/malebligi la interfacon XML-RPC.'; -$lang['xmlrpcuser'] = 'Permesi XML-RPC-an aliron al certaj grupoj aŭ uzantoj, bonvolu meti iliajn komoseparitajn nomojn tie ĉi. Alirebli de ĉiu, ĝin lasu malplena.'; $lang['updatecheck'] = 'Ĉu kontroli aktualigojn kaj sekurecajn avizojn? DokuWiki bezonas kontakti update.dokuwiki.org por tiu ĉi trajto.'; $lang['userewrite'] = 'Uzi netajn URL-ojn'; $lang['useslash'] = 'Uzi frakcistrekon kiel apartigsignaĵo por nomspacoj en URL-oj'; diff --git a/lib/plugins/config/lang/es/lang.php b/lib/plugins/config/lang/es/lang.php index 1189a6781..fd911433c 100644 --- a/lib/plugins/config/lang/es/lang.php +++ b/lib/plugins/config/lang/es/lang.php @@ -102,8 +102,6 @@ $lang['disableactions_other'] = 'Otras acciones (separadas por coma)'; $lang['sneaky_index'] = 'Por defecto, DokuWiki mostrará todos los namespaces en el index. Habilitando esta opción los ocultará si el usuario no tiene permisos de lectura. Los sub-namespaces pueden resultar inaccesibles. El index puede hacerse poco usable dependiendo de las configuraciones ACL.'; $lang['auth_security_timeout'] = 'Tiempo de Autenticación (en segundos), por motivos de seguridad'; $lang['securecookie'] = 'Las cookies establecidas por HTTPS, ¿el naveagdor solo puede enviarlas por HTTPS? Inhabilite esta opción cuando solo se asegure con SSL la entrada, pero no la navegación de su wiki.'; -$lang['xmlrpc'] = 'Habilitar/Deshabilitar interfaz XML-RPC'; -$lang['xmlrpcuser'] = 'Restringir el acceso XML-RPC a los grupos o usuarios separados por coma mencionados aquí. Dejar en blanco para dar acceso a todo el mundo. '; $lang['updatecheck'] = '¿Comprobar actualizaciones y advertencias de seguridad? Esta característica requiere que DokuWiki se conecte a update.dokuwiki.org.'; $lang['userewrite'] = 'Usar URLs bonitas'; $lang['useslash'] = 'Usar barra (/) como separador de espacios de nombres en las URLs'; diff --git a/lib/plugins/config/lang/eu/lang.php b/lib/plugins/config/lang/eu/lang.php index 9d001d494..97addbb50 100644 --- a/lib/plugins/config/lang/eu/lang.php +++ b/lib/plugins/config/lang/eu/lang.php @@ -83,8 +83,6 @@ $lang['disableactions_other'] = 'Beste ekintzak (komaz bereiztuak)'; $lang['sneaky_index'] = 'Lehenespenez, DokuWiki-k izen-espazio guztiak indize bistan erakutsiko ditu. Aukera hau gaituta, erabiltzaieak irakurtzeko baimenik ez dituen izen-espazioak ezkutatuko dira. Honek atzigarriak diren azpi izen-espazioak ezkutatzen ditu. Agian honek indizea erabili ezin ahal izatea eragingo du AKL ezarpen batzuetan.'; $lang['auth_security_timeout'] = 'Kautotze Segurtasun Denbora-Muga (segunduak)'; $lang['securecookie'] = 'HTTPS bidez ezarritako cookie-ak HTTPS bidez bakarrik bidali beharko lituzke nabigatzaileak? Ezgaitu aukera hau bakarrik saio hasierak SSL bidezko segurtasuna badu baina wiki-areb nabigazioa modu ez seguruan egiten bada. '; -$lang['xmlrpc'] = 'Gaitu/ezgaitu XML-RPC interfazea.'; -$lang['xmlrpcuser'] = 'XML-RPC atzipena mugatu hemen emandako komaz bereiztutako talde eta erabiltzaileei. Utzi hutsik atzipena guztiei emateko.'; $lang['updatecheck'] = 'Konprobatu eguneratze eta segurtasun oharrak? DokuWiki-k honetarako update.dokuwiki.org kontaktatu behar du.'; $lang['userewrite'] = 'Erabili URL politak'; $lang['useslash'] = 'Erabili barra (/) izen-espazio banatzaile moduan URLetan'; diff --git a/lib/plugins/config/lang/fa/lang.php b/lib/plugins/config/lang/fa/lang.php index 42cc3ed05..c1a112365 100644 --- a/lib/plugins/config/lang/fa/lang.php +++ b/lib/plugins/config/lang/fa/lang.php @@ -86,8 +86,6 @@ $lang['disableactions_other'] = 'فعالیت‌های دیگر (با ویرگ $lang['sneaky_index'] = 'به طور پیش‌فرض، DokuWiki در فهرست تمامی فضای‌نام‌ها را نمایش می‌دهد. فعال کردن این گزینه، مواردی را که کاربر حق خواندنشان را ندارد مخفی می‌کند. این گزینه ممکن است باعث دیده نشدن زیرفضای‌نام‌هایی شود که دسترسی خواندن به آن‌ها وجود دارد. و ممکن است باعث شود که فهرست در حالاتی از دسترسی‌ها، غیرقابل استفاده شود.'; $lang['auth_security_timeout'] = 'زمان انقضای معتبرسازی به ثانیه'; $lang['securecookie'] = 'آیا کوکی‌ها باید با قرارداد HTTPS ارسال شوند؟ این گزینه را زمانی که فقط صفحه‌ی ورود ویکی‌تان با SSL امن شده است، اما ویکی را ناامن مرور می‌کنید، غیرفعال نمایید.'; -$lang['xmlrpc'] = 'فعال/غیرفعال کردن XML-RPC'; -$lang['xmlrpcuser'] = 'محمدود کردن دسترسی به XML-RPC توسط گروه های جدا شده توسط ویرگول ویا اعضای داده شده در اینجا. این مکان را خالی بگزارید تا به همه دسترسی داده شود.'; $lang['updatecheck'] = 'هشدارهای به روز رسانی و امنیتی بررسی شود؟ برای این‌کار DokuWiki با سرور update.dokuwiki.org تماس خواهد گرفت.'; $lang['userewrite'] = 'از زیباکننده‌ی آدرس‌ها استفاده شود'; $lang['useslash'] = 'از اسلش «/» برای جداکننده‌ی آدرس فضای‌نام‌ها استفاده شود'; diff --git a/lib/plugins/config/lang/fi/lang.php b/lib/plugins/config/lang/fi/lang.php index 9598a0d93..f75a18ecd 100644 --- a/lib/plugins/config/lang/fi/lang.php +++ b/lib/plugins/config/lang/fi/lang.php @@ -88,8 +88,6 @@ $lang['disableactions_other'] = 'Muut toiminnot (pilkulla erotettuna)'; $lang['sneaky_index'] = 'Oletuksena DokuWiki näyttää kaikki nimiavaruudet index-näkymäsä. Tämä asetus piilottaa ne, joihin käyttäjällä ei ole lukuoikeuksia. Tämä voi piilottaa joitakin sallittuja alinimiavaruuksia. Tästä johtuen index-näkymä voi olla käyttökelvoton joillakin ACL-asetuksilla'; $lang['auth_security_timeout'] = 'Autentikoinnin aikakatkaisu (sekunteja)'; $lang['securecookie'] = 'Lähetetäänkö HTTPS:n kautta asetetut evästetiedot HTTPS-yhteydellä? Kytke pois, jos vain wikisi kirjautuminen on suojattu SSL:n avulla, mutta muuten wikiä käytetään ilman suojausta.'; -$lang['xmlrpc'] = 'Käytä/poista XML-RPC liityntää'; -$lang['xmlrpcuser'] = 'Estä XML-RPC:n käyttö pilkulla erotetun listan ryhmille tai käyttäjille. Jätä tyhjäksi salliaksesi käyttö kaikille.'; $lang['updatecheck'] = 'Tarkista päivityksiä ja turvavaroituksia? Tätä varten DokuWikin pitää ottaa yhteys update.dokuwiki.orgiin.'; $lang['userewrite'] = 'Käytä siivottuja URLeja'; $lang['useslash'] = 'Käytä kauttaviivaa nimiavaruuksien erottimena URL-osoitteissa'; diff --git a/lib/plugins/config/lang/fr/lang.php b/lib/plugins/config/lang/fr/lang.php index 8f669a629..42a7f8d07 100644 --- a/lib/plugins/config/lang/fr/lang.php +++ b/lib/plugins/config/lang/fr/lang.php @@ -96,8 +96,6 @@ $lang['disableactions_other'] = 'Autres actions (séparées par des virgules)'; $lang['sneaky_index'] = 'Par défaut, DokuWiki affichera toutes les catégories dans la vue par index. Activer cette option permet de cacher celles pour lesquelles l\'utilisateur n\'a pas la permission de lecture. Il peut en résulter le masquage de sous-catégories accessibles. Ceci peut rendre l\'index inutilisable avec certaines ACL.'; $lang['auth_security_timeout'] = 'Délai d\'expiration de sécurité (secondes)'; $lang['securecookie'] = 'Les cookies mis via HTTPS doivent-ils n\'être envoyé par le navigateur que via HTTPS ? Ne désactivez cette option que si la connexion à votre wiki est sécurisée avec SSL mais que la navigation sur le wiki n\'est pas sécurisée.'; -$lang['xmlrpc'] = 'Activer l\'interface XML-RPC.'; -$lang['xmlrpcuser'] = 'Restreindre l\'accès à XML-RPC aux groupes et utilisateurs indiqués ici. Laisser vide afin que tout le monde y ait accès.'; $lang['updatecheck'] = 'Vérifier les mises à jour ? DokuWiki doit pouvoir contacter update.dokuwiki.org.'; $lang['userewrite'] = 'URL esthétiques'; $lang['useslash'] = 'Utiliser « / » comme séparateur de catégorie dans les URL'; diff --git a/lib/plugins/config/lang/gl/lang.php b/lib/plugins/config/lang/gl/lang.php index 07d62b7af..861336371 100644 --- a/lib/plugins/config/lang/gl/lang.php +++ b/lib/plugins/config/lang/gl/lang.php @@ -84,8 +84,6 @@ $lang['disableactions_other'] = 'Outras accións (separadas por comas)'; $lang['sneaky_index'] = 'O DokuWiki amosará por defecto todos os nomes de espazo na vista de índice. Se activas isto agocharanse aqueles onde o usuario non teña permisos de lectura.'; $lang['auth_security_timeout'] = 'Tempo Límite de Seguridade de Autenticación (segundos)'; $lang['securecookie'] = 'Deben enviarse só vía HTTPS polo navegador as cookies configuradas vía HTTPS? Desactiva esta opción cando só o inicio de sesión do teu wiki estea asegurado con SSL pero a navegación do mesmo se faga de xeito inseguro.'; -$lang['xmlrpc'] = 'Activar/Desactivar interface XML-RPC'; -$lang['xmlrpcuser'] = 'Restrinxir o acceso mediante XML-RPC á lista separada por comas dos grupos e/ou usuarios proporcionados aquí. Déixao baleiro para darlle acceso a todas as persoas.'; $lang['updatecheck'] = 'Comprobar se hai actualizacións e avisos de seguridade? O DokuWiki precisa contactar con update.dokuwiki.org para executar esta característica.'; $lang['userewrite'] = 'Utilizar URLs amigábeis'; $lang['useslash'] = 'Utilizar a barra inclinada (/) como separador de nome de espazo nos URLs'; diff --git a/lib/plugins/config/lang/he/lang.php b/lib/plugins/config/lang/he/lang.php index e80a1bd7a..b200082c9 100644 --- a/lib/plugins/config/lang/he/lang.php +++ b/lib/plugins/config/lang/he/lang.php @@ -82,7 +82,6 @@ $lang['disableactions_wikicode'] = 'הצגת המקור/יצוא גולמי'; $lang['disableactions_other'] = 'פעולות אחרות (מופרדות בפסיק)'; $lang['sneaky_index'] = 'כברירת מחדל, דוקוויקי יציג את כל מרחבי השמות בתצוגת תוכן הענינים. בחירה באפשרות זאת תסתיר את אלו שבהם למשתמש אין הרשאות קריאה. התוצאה עלולה להיות הסתרת תת מרחבי שמות אליהם יש למשתמש גישה. באופן זה תוכן הענינים עלול להפוך לחסר תועלת עם הגדרות ACL מסוימות'; $lang['auth_security_timeout'] = 'מגבלת אבטח פסק הזמן להזדהות (שניות)'; -$lang['xmlrpc'] = 'לאפשר.לחסום את מנשק XML-RPC'; $lang['updatecheck'] = 'בדיקת עידכוני אבטחה והתראות? על DokuWiki להתקשר אל update.dokuwiki.org לצורך כך.'; $lang['userewrite'] = 'השתמש בכתובות URL יפות'; $lang['useslash'] = 'השתמש בלוכסן להגדרת מרחבי שמות בכתובות'; diff --git a/lib/plugins/config/lang/hu/lang.php b/lib/plugins/config/lang/hu/lang.php index f991b7c95..a1de94160 100644 --- a/lib/plugins/config/lang/hu/lang.php +++ b/lib/plugins/config/lang/hu/lang.php @@ -89,8 +89,6 @@ $lang['disableactions_other'] = 'Egyéb tevékenységek (vesszővel elválasztv $lang['sneaky_index'] = 'Alapértelmezetten minden névtér látszik a DokuWiki áttekintő (index) oldalán. Ezen opció bekapcsolása után azok nem jelennek meg, melyekhez a felhasználónak nincs olvasás joga. De ezzel eltakarhatunk egyébként elérhető al-névtereket is, így bizonyos ACL beállításoknál használhatatlan indexet eredményez ez a beállítás.'; $lang['auth_security_timeout'] = 'Authentikációs biztonsági időablak (másodperc)'; $lang['securecookie'] = 'A böngészők a HTTPS felett beállított sütijüket csak HTTPS felett küldhetik? Kapcsoljuk ki ezt az opciót, ha csak a bejelentkezést védjük SSL-lel, a wiki tartalmának böngészése nyílt forgalommal történik.'; -$lang['xmlrpc'] = 'XML-RPC interfész engedélyezése/tiltása'; -$lang['xmlrpcuser'] = 'Korlátozza XML-RPC hozzáférést az itt megadott vesszővel elválasztott csoportok vagy felhasználók számára. Hagyja üresen, ha mindenki számára biztosítja a hozzáférést.'; $lang['updatecheck'] = 'Frissítések és biztonsági figyelmeztetések figyelése. Ehhez a DokuWikinek kapcsolatba kell lépnie a update.dokuwiki.org-gal.'; $lang['userewrite'] = 'Szép URL-ek használata'; $lang['useslash'] = 'Per-jel használata névtér-elválasztóként az URL-ekben'; diff --git a/lib/plugins/config/lang/ia/lang.php b/lib/plugins/config/lang/ia/lang.php index 689869b89..fdb9d954e 100644 --- a/lib/plugins/config/lang/ia/lang.php +++ b/lib/plugins/config/lang/ia/lang.php @@ -83,8 +83,6 @@ $lang['disableactions_other'] = 'Altere actiones (separate per commas)'; $lang['sneaky_index'] = 'Normalmente, DokuWiki monstra tote le spatios de nomines in le vista del indice. Si iste option es active, illos ubi le usator non ha le permission de lectura essera celate. Isto pote resultar in le celamento de subspatios de nomines accessibile. Isto pote render le indice inusabile con certe configurationes de ACL.'; $lang['auth_security_timeout'] = 'Expiration pro securitate de authentication (secundas)'; $lang['securecookie'] = 'Debe le cookies definite via HTTPS solmente esser inviate via HTTPS per le navigator? Disactiva iste option si solmente le apertura de sessiones a tu wiki es protegite con SSL ma le navigation del wiki es facite sin securitate.'; -$lang['xmlrpc'] = 'Activar/disactivar interfacie XML-RPC.'; -$lang['xmlrpcuser'] = 'Limitar le accesso a XML-RPC al gruppos o usatores date hic, separate per commas. Lassa isto vacue pro dar accesso a omnes.'; $lang['updatecheck'] = 'Verificar si existe actualisationes e advertimentos de securitate? DokuWiki debe contactar update.dokuwiki.org pro exequer iste function.'; $lang['userewrite'] = 'Usar URLs nette'; $lang['useslash'] = 'Usar le barra oblique ("/") como separator de spatios de nomines in URLs'; diff --git a/lib/plugins/config/lang/id-ni/lang.php b/lib/plugins/config/lang/id-ni/lang.php index edde733fb..7b7e14ce5 100644 --- a/lib/plugins/config/lang/id-ni/lang.php +++ b/lib/plugins/config/lang/id-ni/lang.php @@ -5,7 +5,6 @@ * @author Harefa * @author Yustinus Waruwu */ -$lang['xmlrpc'] = 'Orifi/böi\'orifi XML-RPC interface.'; $lang['renderer_xhtml'] = 'Fake Renderer ba zito\'ölö (XHTML) Wiki-output.'; $lang['renderer__core'] = '%s (dokuwiki core)'; $lang['renderer__plugin'] = '%s (plugin)'; diff --git a/lib/plugins/config/lang/it/lang.php b/lib/plugins/config/lang/it/lang.php index c4dd433ed..9c348dcee 100644 --- a/lib/plugins/config/lang/it/lang.php +++ b/lib/plugins/config/lang/it/lang.php @@ -94,8 +94,6 @@ $lang['disableactions_other'] = 'Altre azioni (separate da virgola)'; $lang['sneaky_index'] = 'Normalmente, DokuWiki mostra tutte le categorie nella vista indice. Abilitando questa opzione, saranno nascoste quelle per cui l\'utente non ha il permesso in lettura. Questo potrebbe far sì che alcune sottocategorie accessibili siano nascoste. La pagina indice potrebbe quindi diventare inutilizzabile con alcune configurazioni dell\'ACL.'; $lang['auth_security_timeout'] = 'Tempo di sicurezza per l\'autenticazione (secondi)'; $lang['securecookie'] = 'Devono i cookies impostati tramite HTTPS essere inviati al browser solo tramite HTTPS? Disattiva questa opzione solo quando l\'accesso al tuo wiki viene effettuato con il protocollo SSL ma la navigazione del wiki non risulta sicura.'; -$lang['xmlrpc'] = 'Abilita/disabilita interfaccia XML-RPC.'; -$lang['xmlrpcuser'] = 'Limita l\'accesso XML-RPC ai gruppi o utenti indicati qui (separati da virgola). Lascia il campo vuoto per dare accesso a tutti.'; $lang['updatecheck'] = 'Controllare aggiornamenti e avvisi di sicurezza? DokuWiki deve contattare update.dokuwiki.org per questa funzione.'; $lang['userewrite'] = 'Usa il rewrite delle URL'; $lang['useslash'] = 'Usa la barra rovescia (slash) come separatore nelle URL'; diff --git a/lib/plugins/config/lang/ja/lang.php b/lib/plugins/config/lang/ja/lang.php index 19f10af48..61161290d 100644 --- a/lib/plugins/config/lang/ja/lang.php +++ b/lib/plugins/config/lang/ja/lang.php @@ -89,8 +89,6 @@ $lang['disableactions_other'] = 'その他の動作（カンマ区切り）'; $lang['sneaky_index'] = 'デフォルトでは索引にすべての名前空間を表示しますが、この機能はユーザーに閲覧権限のない名前空間を非表示にします。ただし、閲覧が可能な副名前空間まで表示されなくなるため、ACLの設定が適正でない場合は索引機能が使えなくなる場合があります。'; $lang['auth_security_timeout'] = '認証タイムアウト設定（秒）'; $lang['securecookie'] = 'クッキーをHTTPSにてセットする場合は、ブラウザよりHTTPS経由で送信された場合にみに制限しますか？ログインのみをSSLで行う場合は、この機能を無効にしてください。'; -$lang['xmlrpc'] = 'XML-RPCインターフェースを有効/無効にする'; -$lang['xmlrpcuser'] = 'XML-RPCアクセスを指定グループとユーザーに制限します（半角コンマ区切り）。　すべての人にアクセスを許可する場合は空のままにしてください。'; $lang['updatecheck'] = 'DokuWikiの更新とセキュリティに関する情報をチェックしますか？ この機能は update.dokuwiki.org への接続が必要です。'; $lang['userewrite'] = 'URLの書き換え'; $lang['useslash'] = 'URL上の名前空間の区切りにスラッシュを使用'; diff --git a/lib/plugins/config/lang/ko/lang.php b/lib/plugins/config/lang/ko/lang.php index 20cfcdcfe..1c929c25c 100644 --- a/lib/plugins/config/lang/ko/lang.php +++ b/lib/plugins/config/lang/ko/lang.php @@ -90,8 +90,6 @@ $lang['sneaky_index'] = '기본적으로, DokuWiki는 색인 목록에 특정 ACL 설정은 색인 사용이 불가능하게 할 수도 있습니다.'; $lang['auth_security_timeout'] = '인증 보안 초과 시간(초)'; $lang['securecookie'] = 'HTTPS로 보내진 쿠키는 HTTPS에만 적용 할까요? 위키의 로그인 페이지만 SSL로 암호화 하고 위키 페이지는 그렇지 않은경우 꺼야 합니다.'; -$lang['xmlrpc'] = 'XML-RPC 인터페이스 지원/무시'; -$lang['xmlrpcuser'] = '주어진 그룹이나 유저들에게만 XML-RPC접근을 허락하려면 컴마로 구분하여 적으세요. 비어두면 모두에게 허용됩니다.'; $lang['updatecheck'] = '업데이트와 보안 문제를 검사(DokuWiki를 update.dokuwiki.org에 연결해야 합니다.)'; $lang['userewrite'] = 'URL rewriting기능 사용'; $lang['useslash'] = 'URL에서 네임스페이스 구분자로 슬래쉬 문자 사용'; diff --git a/lib/plugins/config/lang/la/lang.php b/lib/plugins/config/lang/la/lang.php index 07d92ae36..057e69974 100644 --- a/lib/plugins/config/lang/la/lang.php +++ b/lib/plugins/config/lang/la/lang.php @@ -82,8 +82,6 @@ $lang['disableactions_other'] = 'Aliae actiones (uirgulis diuisae)'; $lang['sneaky_index'] = 'Hic uicis omnia genera in indice inserit. Si ineptam hanc optionem facias, solum ea, quae Sodales uidere possunt, in indice erunt. Hoc suggreges et suggenera abscondere potest.'; $lang['auth_security_timeout'] = 'Confirmationis Tempus (secundis)'; $lang['securecookie'] = 'Formulae HTTPS mittine solum per HTTPS possunt? Ineptam hanc optio facias, si accessus uicis tutus est, sed interretis non.'; -$lang['xmlrpc'] = 'Aptam\Ineptam XML-RPC administrationem facere'; -$lang['xmlrpcuser'] = 'Accessus XML-RPC gregibus uel Sodalibus in hoc indice astringere. Nihil scribere ut omnes accessum habeant'; $lang['updatecheck'] = 'Nouationes et fiducias inspicerene? Hic uicis connectere update.dokuwiki.org debes.'; $lang['userewrite'] = 'VRL formosis uti'; $lang['useslash'] = 'Repagula in URL, ut genera diuidas, uti'; diff --git a/lib/plugins/config/lang/lv/lang.php b/lib/plugins/config/lang/lv/lang.php index 2f5883269..f95697c46 100644 --- a/lib/plugins/config/lang/lv/lang.php +++ b/lib/plugins/config/lang/lv/lang.php @@ -84,8 +84,6 @@ $lang['disableactions_other'] = 'citas darbības (atdalīt ar komatiem)'; $lang['sneaky_index'] = 'Pēc noklusētā DokuWiki lapu sarakstā parāda visu nodaļu lapas. Ieslēdzot šo parametru, noslēps tās nodaļas, kuras apmeklētājam nav tiesības lasīt. Bet tad tiks arī paslēptas dziļākas, bet atļautas nodaļas. Atsevišķos pieejas tiesību konfigurācijas gadījumos lapu saraksts var nedarboties.'; $lang['auth_security_timeout'] = 'Autorizācijas drošības intervāls (sekundēs)'; $lang['securecookie'] = 'Vai pa HTTPS sūtāmās sīkdatnes sūtīt tikai pa HTTPS? Atslēdz šo iespēju, kad tikai pieteikšanās wiki sistēmā notiek pa SSL šifrētu savienojumu, bet skatīšana - pa nešifrētu.'; -$lang['xmlrpc'] = 'Ieslēgt/izslēgt XML-RPC interfeisu.'; -$lang['xmlrpcuser'] = 'Ierobežot XML-RPC piekļuvi norādītām lietotāju grupām vai lietotājiem (atdalīt ar komatiem!). Atstāt tukšu, lai piekļuve būtu visiem.'; $lang['updatecheck'] = 'Pārbaudīt, vai pieejami atjauninājumi un drošības brīdinājumi? Dokuwiki sazināsies ar update.dokuwiki.org'; $lang['userewrite'] = 'Ērti lasāmas adreses (URL)'; $lang['useslash'] = 'Lietot slīpiņu par URL atdalītāju'; diff --git a/lib/plugins/config/lang/mr/lang.php b/lib/plugins/config/lang/mr/lang.php index 321e05546..4f33bfa7c 100644 --- a/lib/plugins/config/lang/mr/lang.php +++ b/lib/plugins/config/lang/mr/lang.php @@ -86,8 +86,6 @@ $lang['disableactions_other'] = 'इतर क्रिया ( स्वल् $lang['sneaky_index'] = 'सूची दृश्यामधे डिफॉल्ट स्वरूपात डॉक्युविकी सगळे नेमस्पेस दाखवते. हा पर्याय चालू केल्यास सदस्याला वाचण्याची परवानगी नसलेले नेमस्पेस दिसणार नाहीत. यामुळे परवानगी असलेले उप - नेमस्पेस न दिसण्याची शक्यता आहे. यामुळे काही विशिष्ठ ACL सेटिंगसाठी सूची वापरता येण्यासारखी राहणार नाही.'; $lang['auth_security_timeout'] = 'अधिकृत करण्याच्या प्रक्रियेची कालमर्यादा'; $lang['securecookie'] = 'HTTPS वापरून सेट केलेले कूकीज ब्राउजरने HTTPS द्वाराच पाठवले पाहिजेत का? जर तुमच्या विकीचं फ़क्त लॉगिन पानच SSL वापरून सुरक्षित केलं असेल व पानांचं ब्राउजिंग असुरक्षित असेल तर हा पर्याय चालू करू नका.'; -$lang['xmlrpc'] = 'XML-RPC इंटरफेस चालू/बंद करा'; -$lang['xmlrpcuser'] = 'XML-RPC सुविधा फ़क्त इथे स्वल्पविरामाने अलग करून दिलेल्या गट किंवा वापरकर्त्याला उपलब्ध आहेत. सर्वाना ही सुविधा देण्यासाठी ही जागा रिकामी सोडा.'; $lang['updatecheck'] = 'अपडेट आणि सुरक्षिततेविशयी सूचनान्वर पाळत ठेऊ का? या सुविधेसाठी डॉक्युविकीला update.dokuwiki.org शी संपर्क साधावा लागेल.'; $lang['userewrite'] = 'छान छान URL वापर'; $lang['useslash'] = 'URL मधे नेमस्पेस अलग करण्यासाठी \'/\' चिह्न वापरा'; diff --git a/lib/plugins/config/lang/nl/lang.php b/lib/plugins/config/lang/nl/lang.php index f6574ee2c..6bde9eb4e 100644 --- a/lib/plugins/config/lang/nl/lang.php +++ b/lib/plugins/config/lang/nl/lang.php @@ -94,8 +94,6 @@ $lang['disableactions_other'] = 'Andere akties (gescheiden door komma\'s)'; $lang['sneaky_index'] = 'Met de standaardinstellingen zal DokuWiki alle namespaces laten zien in de index. Het inschakelen van deze optie zorgt ervoor dat de namespaces waar de gebruiker geen leestoegang tot heeft, verborgen worden. Dit kan resulteren in het verbergen van subnamespaces waar de gebruiker wel toegang to heeft. Dit kan de index onbruikbaar maken met bepaalde ACL-instellingen.'; $lang['auth_security_timeout'] = 'Authenticatiebeveiligings-timeout (seconden)'; $lang['securecookie'] = 'Moeten cookies die via HTTPS gezet zijn alleen via HTTPS verzonden worden door de browser? Zet deze optie uit als alleen het inloggen op de wiki beveiligd is, maar het gebruik verder niet.'; -$lang['xmlrpc'] = 'Inschakelen/uitschakelen XML-RPC interface.'; -$lang['xmlrpcuser'] = 'Beperk XML-RPC toegang tot de lijst met kommagescheiden groepen of gebruikers die hier zijn opgegeven. Laat leeg om iedereen toegang te geven.'; $lang['updatecheck'] = 'Controleer op nieuwe versies en beveiligingswaarschuwingen? DokuWiki moet hiervoor contact opnemen met update.dokuwiki.org.'; $lang['userewrite'] = 'Gebruik nette URL\'s'; $lang['useslash'] = 'Gebruik slash (/) als scheiding tussen namepaces in URL\'s'; diff --git a/lib/plugins/config/lang/no/lang.php b/lib/plugins/config/lang/no/lang.php index 3c4890149..2245a8813 100644 --- a/lib/plugins/config/lang/no/lang.php +++ b/lib/plugins/config/lang/no/lang.php @@ -99,9 +99,6 @@ $lang['disableactions_other'] = 'Andre kommandoer (kommaseparert)'; $lang['sneaky_index'] = 'DokuWiki vil som standard vise alle navnerom i innholdsfortegnelsen. Hvis du skrur på dette alternativet vil brukere bare se de navnerommene der de har lesetilgang. Dette kan føre til at tilgjengelige undernavnerom skjules. Det kan gjøre innholdsfortegnelsen ubrukelig med enkelte ACL-oppsett.'; $lang['auth_security_timeout'] = 'Autentisering utløper etter (sekunder)'; $lang['securecookie'] = 'Skal informasjonskapsler satt via HTTPS kun sendes via HTTPS av nettleseren? Skal ikke velges dersom bare innloggingen til din wiki er sikret med SSL, og annen navigering på wikien er usikret.'; -$lang['xmlrpc'] = 'Slå på/slå av XML-RPC-grensesnitt'; -$lang['xmlrpcuser'] = 'Å tillate XML-RPC-adgang til bestemte grupper eller brukere, sette deres navne (kommaseparert) her. Slik får du tilgang til alle, la feltet tomt. -'; $lang['updatecheck'] = 'Se etter oppdateringer og sikkerhetsadvarsler? Denne funksjonen er avhengig av å kontakte update.dokuwiki.org.'; $lang['userewrite'] = 'Bruk pene URLer'; $lang['useslash'] = 'Bruk / som skilletegn mellom navnerom i URLer'; diff --git a/lib/plugins/config/lang/pl/lang.php b/lib/plugins/config/lang/pl/lang.php index 6e94a2e3d..0e69cc8f1 100644 --- a/lib/plugins/config/lang/pl/lang.php +++ b/lib/plugins/config/lang/pl/lang.php @@ -92,8 +92,6 @@ $lang['disableactions_other'] = 'Inne akcje (oddzielone przecinkiem)'; $lang['sneaky_index'] = 'Domyślnie, Dokuwiki pokazuje wszystkie katalogi w indeksie. Włączenie tej opcji ukryje katalogi, do których użytkownik nie ma praw. Może to spowodować ukrycie podkatalogów, do których użytkownik ma prawa. Ta opcja może spowodować błędne działanie indeksu w połączeniu z pewnymi konfiguracjami praw dostępu.'; $lang['auth_security_timeout'] = 'Czas wygaśnięcia uwierzytelnienia (w sekundach)'; $lang['securecookie'] = 'Czy ciasteczka wysłane do przeglądarki przez HTTPS powinny być przez nią odsyłane też tylko przez HTTPS? Odznacz tę opcję tylko wtedy, gdy logowanie użytkowników jest zabezpieczone SSL, ale przeglądanie stron odbywa się bez zabezpieczenia.'; -$lang['xmlrpc'] = 'Włącz/wyłącz interfejs XML-RPC'; -$lang['xmlrpcuser'] = 'Lista użytkowników i grup, którzy mogą korzystać z protokołu XML-RPC. Nazwy grup i użytkowników rozdziel przecinkami, puste pole oznacza dostęp dla wszystkich.'; $lang['updatecheck'] = 'Sprawdzanie aktualizacji i bezpieczeństwa. DokuWiki będzie kontaktować się z serwerem update.dokuwiki.org.'; $lang['userewrite'] = 'Proste adresy URL'; $lang['useslash'] = 'Używanie ukośnika jako separatora w adresie URL'; diff --git a/lib/plugins/config/lang/pt-br/lang.php b/lib/plugins/config/lang/pt-br/lang.php index 093e60ff8..8c0ef713a 100644 --- a/lib/plugins/config/lang/pt-br/lang.php +++ b/lib/plugins/config/lang/pt-br/lang.php @@ -98,8 +98,6 @@ $lang['disableactions_other'] = 'Outras ações (separadas por vírgula)'; $lang['sneaky_index'] = 'Por padrão, o DokuWiki irá exibir todos os espaços de nomes na visualização do índice. Ao habilitar essa opção, serão escondidos aqueles que o usuário não tiver permissão de leitura. Isso pode resultar na omissão de subespaços de nomes, tornando o índice inútil para certas configurações de ACL.'; $lang['auth_security_timeout'] = 'Tempo limite de segurança para autenticações (seg)'; $lang['securecookie'] = 'Os cookies definidos via HTTPS devem ser enviados para o navegador somente via HTTPS? Desabilite essa opção quando somente a autenticação do seu wiki for realizada de maneira segura via SSL e a navegação, de maneira insegura.'; -$lang['xmlrpc'] = 'Habilitar/desabilitar interface XML-RPC.'; -$lang['xmlrpcuser'] = 'Acesso Restrito ao XML-RPC para grupos separados por virgula ou usuários aqui. Deixe em branco para conveder acesso a todos.'; $lang['updatecheck'] = 'Verificar atualizações e avisos de segurança? O DokuWiki precisa contactar o "splitbrain.org" para efetuar esse recurso.'; $lang['userewrite'] = 'Usar URLs "limpas"'; $lang['useslash'] = 'Usar a barra como separador de espaços de nomes nas URLs'; diff --git a/lib/plugins/config/lang/pt/lang.php b/lib/plugins/config/lang/pt/lang.php index fe05bd281..d0fe0ac0d 100644 --- a/lib/plugins/config/lang/pt/lang.php +++ b/lib/plugins/config/lang/pt/lang.php @@ -87,8 +87,6 @@ $lang['disableactions_other'] = 'Outras acções (separadas por vírgula)'; $lang['sneaky_index'] = 'Por norma, o DokuWiki irá exibir todos os espaços de nomes na visualização do índice. Ao habilitar essa opção, serão escondidos aqueles em que o utilizador não tenha permissão de leitura. Isto pode resultar na omissão de sub-ramos acessíveis, que poderá tornar o índice inútil para certas configurações de ACL.'; $lang['auth_security_timeout'] = 'Tempo limite de segurança para autenticações (seg)'; $lang['securecookie'] = 'Os cookies definidos via HTTPS deverão ser enviados para o navegador somente via HTTPS? Desabilite essa opção quando somente a autenticação do seu wiki for realizada de maneira segura via SSL e a navegação de maneira insegura.'; -$lang['xmlrpc'] = 'Habilitar/desabilitar interface XML-RPC.'; -$lang['xmlrpcuser'] = 'Restringir acesso XML-RPC para os grupos separados por vírgula ou utilizadores inseridos aqui. Deixar vazio para dar acesso a todos.'; $lang['updatecheck'] = 'Verificar por actualizações e avisos de segurança? O DokuWiki precisa contactar o "splitbrain.org" para efectuar esta verificação.'; $lang['userewrite'] = 'Usar URLs SEO'; $lang['useslash'] = 'Usar a barra como separador de espaços de nomes nas URLs'; diff --git a/lib/plugins/config/lang/ro/lang.php b/lib/plugins/config/lang/ro/lang.php index 6b0a0e91a..5b15ec3dc 100644 --- a/lib/plugins/config/lang/ro/lang.php +++ b/lib/plugins/config/lang/ro/lang.php @@ -89,8 +89,6 @@ $lang['disableactions_other'] = 'Alte acţiuni (separate prin virgulă)'; $lang['sneaky_index'] = 'Implicit, DokuWiki va arăta toate numele de spaţii la vizualizarea indexului. Activând această opţiune vor fi ascunse acelea la care utilizatorul nu are drepturi de citire. Aceasta poate determina ascunderea sub-numelor de spaţii accesibile. Aceasta poate face index-ul inutilizabil cu anumite setări ale ACL'; $lang['auth_security_timeout'] = 'Timpul de expirare al Autentificării Securizate (secunde)'; $lang['securecookie'] = 'Cookies-urile setate via HTTPS să fie trimise doar via HTTPS de către browser? Dezactivaţi această opţiune numai când login-ul wiki-ului este securizat cu SSL dar navigarea wiki-ului se realizează nesecurizat.'; -$lang['xmlrpc'] = 'Activează/dezactivează interfaţa XML-RPC'; -$lang['xmlrpcuser'] = 'Restricţionaţi accesul XML-RPC la grupurile sau utilizatorii separaţi prin virgulă daţi aici. Lasaţi gol pentru a da acces tuturor.'; $lang['updatecheck'] = 'Verificare actualizări şi avertismente privind securitatea? DokuWiki trebuie să contacteze update.dokuwiki.org pentru această facilitate.'; $lang['userewrite'] = 'Folosire URL-uri "nice"'; $lang['useslash'] = 'Foloseşte slash-ul ca separator de spaţii de nume în URL-uri'; diff --git a/lib/plugins/config/lang/ru/lang.php b/lib/plugins/config/lang/ru/lang.php index f29257a28..cd93526e0 100644 --- a/lib/plugins/config/lang/ru/lang.php +++ b/lib/plugins/config/lang/ru/lang.php @@ -95,8 +95,6 @@ $lang['disableactions_other'] = 'Другие операции (через за $lang['sneaky_index'] = 'По умолчанию, «ДокуВики» показывает в индексе страниц все пространства имён. Включение этой опции скроет пространства имён, для которых пользователь не имеет прав чтения. Это может привести к скрытию доступных вложенных пространств имён и потере функциональности индекса страниц при некоторых конфигурациях прав доступа.'; $lang['auth_security_timeout'] = 'Интервал для безопасности авторизации (сек.)'; $lang['securecookie'] = 'Должны ли куки (cookies), выставленные через HTTPS, отправляться браузером только через HTTPS. Отключите эту опцию в случае, когда только логин вашей вики передаётся через SSL, а обычный просмотр осуществляется в небезопасном режиме.'; -$lang['xmlrpc'] = 'Включить/выключить XML-RPC интерфейс.'; -$lang['xmlrpcuser'] = 'Запретить XML-RPC-доступ для списка групп и пользователей, перечисленных через запятую. Оставьте пустым, если хотите оставить доступ всем.'; $lang['updatecheck'] = 'Проверять наличие обновлений и предупреждений о безопасности? Для этого «ДокуВики» потребуется связываться с сайтом splitbrain.org.'; $lang['userewrite'] = 'Удобочитаемые адреса (URL)'; $lang['useslash'] = 'Использовать слэш'; diff --git a/lib/plugins/config/lang/sk/lang.php b/lib/plugins/config/lang/sk/lang.php index 72ce10775..d583c5d15 100644 --- a/lib/plugins/config/lang/sk/lang.php +++ b/lib/plugins/config/lang/sk/lang.php @@ -86,8 +86,6 @@ $lang['disableactions_other'] = 'Iné akcie (oddelené čiarkou)'; $lang['sneaky_index'] = 'DokuWiki implicitne ukazuje v indexe všetky menné priestory. Povolením tejto voľby sa nezobrazia menné priestory, ku ktorým nemá používateľ právo na čítanie. Dôsledkom môže byť nezobrazenie vnorených prístupných menných priestorov. Táto voľba môže mať za následok nepoužiteľnosť indexu s určitými ACL nastaveniami.'; $lang['auth_security_timeout'] = 'Časový limit pri prihlasovaní (v sekundách)'; $lang['securecookie'] = 'Mal by prehliadač posielať cookies nastavené cez HTTPS posielať iba cez HTTPS (bezpečné) pripojenie? Vypnite túto voľbu iba v prípade, ak je prihlasovanie do Vašej wiki zabezpečené SSL, ale prezeranie wiki je nezabezpečené.'; -$lang['xmlrpc'] = 'Povoliť/zakázať XML-RPC rozhranie.'; -$lang['xmlrpcuser'] = 'Obmedziť XML-RPC prístup iba pre uvedené skupiny alebo používateľov (oddelených čiarkami).'; $lang['updatecheck'] = 'Kontrolovať aktualizácie a bezpečnostné upozornenia? DokuWiki potrebuje pre túto funkciu prístup k update.dokuwiki.org.'; $lang['userewrite'] = 'Používať nice URLs'; $lang['useslash'] = 'Používať lomku (/) ako oddeľovač v URL'; diff --git a/lib/plugins/config/lang/sl/lang.php b/lib/plugins/config/lang/sl/lang.php index dadd01595..03bae8e37 100644 --- a/lib/plugins/config/lang/sl/lang.php +++ b/lib/plugins/config/lang/sl/lang.php @@ -86,8 +86,6 @@ $lang['disableactions_other'] = 'Druga dejanja (z vejico ločen seznam)'; $lang['sneaky_index'] = 'Privzeto pokaže sistem DokuWiki vse imenske prostore v pogledu kazala. Z omogočanjem te možnosti bodo skriti vsi imenski prostori, v katere prijavljen uporabnik nima dovoljenj dostopa. S tem je mogoče preprečiti dostop do podrejenih strani. Možnost lahko vpliva na uporabnost nastavitev nadzora dostopa ACL.'; $lang['auth_security_timeout'] = 'Varnostna časovna omejitev overitve (v sekundah)'; $lang['securecookie'] = 'Ali naj se piškotki poslani preko varne povezave HTTPS v brskalniku pošiljajo le preko HTTPS? Onemogočanje možnosti je priporočljivo le takrat, ko je prijava varovana s protokolom SSL, brskanje po strani pa ni posebej zavarovano.'; -$lang['xmlrpc'] = 'Omogoči/Onemogoči vmesnik XML-RPC.'; -$lang['xmlrpcuser'] = 'Omejitev dostopa do vmesnika XML-RPC z vejico ločenim seznamom skupin in uporabnikov. Prazno polje pomeni, prost dostop za vse uporabnike.'; $lang['updatecheck'] = 'Ali naj sistem preveri za posodobitve in varnostna opozorila.'; $lang['userewrite'] = 'Uporabi olepšan zapis naslovov URL'; $lang['useslash'] = 'Uporabi poševnico kot ločilnik imenskih prostorov v naslovih URL'; diff --git a/lib/plugins/config/lang/sq/lang.php b/lib/plugins/config/lang/sq/lang.php index adeb2a47d..69e283b11 100644 --- a/lib/plugins/config/lang/sq/lang.php +++ b/lib/plugins/config/lang/sq/lang.php @@ -83,8 +83,6 @@ $lang['disableactions_other'] = 'Veprime të tjera (të ndarë me presje)'; $lang['sneaky_index'] = 'Vetiu DokuWiki tregon të gjithë hapësirat e emrit në shikimin e index-it. Aktivizimi i kësaj alternative do të fshehë ato ku përdoruesi nuk ka të drejta leximi. Kjo mund të përfundojë në fshehje të nënhapësirave të emrit të aksesueshme. Kjo mund ta bëjë index-in të papërdorshëm me disa konfigurime të caktuara të ACL-së.'; $lang['auth_security_timeout'] = 'Koha e Përfundimit për Autentikim (sekonda)'; $lang['securecookie'] = 'A duhet që cookies të vendosura nëpërmjet HTTPS të dërgohen vetëm nëpërmjet HTTPS nga shfletuesit? Caktivizojeni këtë alternativë kur vetëm hyrja në wiki-n tuaj sigurohet me SSL por shfletimi i wiki-t bëhet në mënyrë të pasigurtë.'; -$lang['xmlrpc'] = 'Aktivizo/Caktivizo ndërfaqen XML-RPC'; -$lang['xmlrpcuser'] = 'Kufizo aksesin XML-RPC vetëm tek grupet ose përdoruesit e ndarë me presje të dhënë këtu. Lëre bosh për t\'i dhënë akses të gjithëve.'; $lang['updatecheck'] = 'Kontrollo për përditësime dhe paralajmërime sigurie? DokuWiki duhet të kontaktojë me update.dokuwiki.org për këtë veti.'; $lang['userewrite'] = 'Përdor URL të këndshme.'; $lang['useslash'] = 'Përdor / si ndarës të hapësirave të emrit në URL'; diff --git a/lib/plugins/config/lang/sr/lang.php b/lib/plugins/config/lang/sr/lang.php index 5906dcd7e..c675b84e6 100644 --- a/lib/plugins/config/lang/sr/lang.php +++ b/lib/plugins/config/lang/sr/lang.php @@ -84,8 +84,6 @@ $lang['disableactions_other'] = 'Остале наредбе (раздвоје $lang['sneaky_index'] = 'По инсталацији DokuWiki ће у индексу приказати све именске просторе. Укључивањем ове опције именски простори у којима корисник нема право читања ће бити сакривени. Консеквенца је да ће и доступни подпростори бити сакривени. Ово доводи до неупотребљивости Права приступа у неким поставкама.'; $lang['auth_security_timeout'] = 'Временска пауза у аутентификацији (секунде)'; $lang['securecookie'] = 'Да ли колачићи који су постављени преко ХТТПС треба слати веб читачу само преко ХТТПС? Искључите ову опцију само ако је пријављивање на вики заштићено ССЛом а остали део викија незаштићен.'; -$lang['xmlrpc'] = 'Укључи/искључи ИксМЛ-РПЦ интерфејс'; -$lang['xmlrpcuser'] = 'Ограничи ИксМЛ-РПЦ приступ на наведене групе корисника раздвојене зарезом. Остави празно да би свима дао приступ.'; $lang['updatecheck'] = 'Провера надоградњи и сигурносних упозорења? Dokuwiki мора да контактира update.dokuwiki.org ради добијања информација.'; $lang['userewrite'] = 'Направи леп УРЛ'; $lang['useslash'] = 'Користи косу црту у УРЛу за раздвајање именских простора '; diff --git a/lib/plugins/config/lang/sv/lang.php b/lib/plugins/config/lang/sv/lang.php index dfd93d37d..3d8392840 100644 --- a/lib/plugins/config/lang/sv/lang.php +++ b/lib/plugins/config/lang/sv/lang.php @@ -97,8 +97,6 @@ $lang['disableactions_other'] = 'Andra funktioner (kommaseparerade)'; $lang['sneaky_index'] = 'Som standard visar DokuWiki alla namnrymder på indexsidan. Genom att aktivera det här valet döljer man namnrymder som användaren inte har behörighet att läsa. Det kan leda till att man döljer åtkomliga undernamnrymder, och gör indexet oanvändbart med vissa ACL-inställningar.'; $lang['auth_security_timeout'] = 'Autentisieringssäkerhets timeout (sekunder)'; $lang['securecookie'] = 'Skall cookies som sätts via HTTPS endast skickas via HTTPS från webbläsaren? Avaktivera detta alternativ endast om inloggningen till din wiki är säkrad med SSL men läsning av wikin är osäkrad.'; -$lang['xmlrpc'] = 'Aktivera/avaktivera XML-RPC-gränssnitt'; -$lang['xmlrpcuser'] = 'Begränsa XML-RPC tillträde till komma separerade grupper eller användare som ges här. Lämna tomt för att ge tillgång till alla.'; $lang['updatecheck'] = 'Kontrollera uppdateringar och säkerhetsvarningar? DokuWiki behöver kontakta update.dokuwiki.org för den här funktionen.'; $lang['userewrite'] = 'Använd rena webbadresser'; $lang['useslash'] = 'Använd snedstreck för att separera namnrymder i webbadresser'; diff --git a/lib/plugins/config/lang/th/lang.php b/lib/plugins/config/lang/th/lang.php index ce7c55e91..140a287df 100644 --- a/lib/plugins/config/lang/th/lang.php +++ b/lib/plugins/config/lang/th/lang.php @@ -41,7 +41,6 @@ $lang['defaultgroup'] = 'กลุ่มมาตรฐาน'; $lang['profileconfirm'] = 'ใส่รหัสผ่านเพื่อยืนยันการเปลี่ยนแปลงข้อมูล'; $lang['disableactions_check'] = 'ตรวจสอบ'; $lang['auth_security_timeout'] = 'ระยะเวลาที่จะตัดการเชื่อมต่อแบบการใช้งานด้วยสิทธิ์ผู้ใช้ (วินาที)'; -$lang['xmlrpc'] = 'ใช้งาน/ยกเลิก การเชื่อมต่อแบบ XML-RPC'; $lang['userewrite'] = 'แสดงที่อยู่เว็บ (URL) แบบอ่านเข้าใจง่าย'; $lang['cachetime'] = 'ระยะเวลาสำหรับการเก็บแคช (วินาที)'; $lang['locktime'] = 'ระยะเวลานานสุด ที่จะล็อคไม่ให้แก้ไขไฟล์ (วินาที)'; diff --git a/lib/plugins/config/lang/uk/lang.php b/lib/plugins/config/lang/uk/lang.php index 72d7e12f5..375c5d3bf 100644 --- a/lib/plugins/config/lang/uk/lang.php +++ b/lib/plugins/config/lang/uk/lang.php @@ -91,8 +91,6 @@ $lang['disableactions_other'] = 'Інші дії (розділені комам $lang['sneaky_index'] = 'За замовчуванням, ДокуВікі показує всі простори імен в змісті. Активація цієї опції сховає ті простори, де користувач не має прав на читання. Результатом може бути неможливість доступу до певних відкритих просторів імен. Це зробить неможливим використання змісту при певних конфігураціях.'; $lang['auth_security_timeout'] = 'Таймаут аутентифікації (в секундах)'; $lang['securecookie'] = 'Чи повинен браузер надсилати файли cookies тільки через HTTPS? Вимкніть цей параметр, лише тоді, якщо вхід до Вікі захищено SSL, але перегляд сторінок відбувається у незахищеному режимі.'; -$lang['xmlrpc'] = 'Дозволити/заборонити XML-RPC інтерфейс'; -$lang['xmlrpcuser'] = 'Заборонити XML-RPC доступ до користувачів або груп поданих тут та розділених комою. Залишіть поле незаповненим, щоб дозволити доступ усім.'; $lang['updatecheck'] = 'Перевірити наявність оновлень чи попереджень безпеки? Для цього ДокуВікі необхідно зв\'язатися зі update.dokuwiki.org.'; $lang['userewrite'] = 'Красиві URL'; $lang['useslash'] = 'Слеш, як розділювач просторів імен в URL'; diff --git a/lib/plugins/config/lang/zh-tw/lang.php b/lib/plugins/config/lang/zh-tw/lang.php index 29aeaec3b..2919ec113 100644 --- a/lib/plugins/config/lang/zh-tw/lang.php +++ b/lib/plugins/config/lang/zh-tw/lang.php @@ -89,8 +89,6 @@ $lang['disableactions_other'] = '其他功能 (逗號分隔)'; $lang['sneaky_index'] = '預設情況下，DokuWiki 會在索引頁會顯示所有命名空間。啟用此選項會隱藏用戶沒有閱讀權限的頁面，但也可能將能閱讀的子頁面一併隱藏。在特定 ACL 設定下，這可能導致索引無法使用。'; $lang['auth_security_timeout'] = '安全認證的計時 (秒)'; $lang['securecookie'] = 'HTTPS 頁面設定的 cookie 是否只能由瀏覽器經 HTTPS 傳送？取消此選項後，只有登入維基會被 SSL 保護而瀏覽時不會。'; -$lang['xmlrpc'] = '啟用/停用 XML-RPC 介面'; -$lang['xmlrpcuser'] = 'XML-RPC 存取權限將局限於在此提供的群組或使用者 (逗號分隔)。若要開放權限給所有人請留白。'; $lang['updatecheck'] = '檢查更新與安全性警告？DokuWiki 需要聯繫 update.dokuwiki.org 才能使用此功能。'; $lang['userewrite'] = '使用好看的 URL'; $lang['useslash'] = '在 URL 中使用斜線作為命名空間的分隔字元'; diff --git a/lib/plugins/config/lang/zh/lang.php b/lib/plugins/config/lang/zh/lang.php index 7a7f0f504..fa51cb1ef 100644 --- a/lib/plugins/config/lang/zh/lang.php +++ b/lib/plugins/config/lang/zh/lang.php @@ -96,8 +96,6 @@ $lang['disableactions_other'] = '其他功能（用英文逗号分隔）'; $lang['sneaky_index'] = '默认情况下，DokuWiki 在索引页会显示所有 namespace。启用该选项能隐藏那些用户没有权限阅读的页面。但也可能将用户能够阅读的子页面一并隐藏。这有可能导致在特定 ACL 设置下，索引功能不可用。'; $lang['auth_security_timeout'] = '认证安全超时（秒）'; $lang['securecookie'] = '要让浏览器须以HTTPS方式传送在HTTPS会话中设置的cookies吗？请只在登录过程为SSL加密而浏览维基为明文的情况下打开此选项。'; -$lang['xmlrpc'] = '启用/禁用 XML-RPC 交互界面。'; -$lang['xmlrpcuser'] = '将 XML-RPC 连接限制在用逗号分隔的组或用户中。留空对所有人开启连接权限。'; $lang['updatecheck'] = '自动检查更新并接收安全警告吗？开启该功能后 DokuWiki 将自动访问 splitbrain.org。'; $lang['userewrite'] = '使用更整洁的 URL'; $lang['useslash'] = '在 URL 中使用斜杠作为命名空间的分隔符'; diff --git a/lib/plugins/config/settings/config.metadata.php b/lib/plugins/config/settings/config.metadata.php index 5f2c32ea7..b95c8d75c 100644 --- a/lib/plugins/config/settings/config.metadata.php +++ b/lib/plugins/config/settings/config.metadata.php @@ -136,8 +136,8 @@ $meta['disableactions'] = array('disableactions', $meta['sneaky_index'] = array('onoff'); $meta['auth_security_timeout'] = array('numeric'); $meta['securecookie'] = array('onoff'); -$meta['xmlrpc'] = array('onoff'); -$meta['xmlrpcuser'] = array('string'); +$meta['remote'] = array('onoff'); +$meta['remoteuser'] = array('string'); $meta['_anti_spam'] = array('fieldset'); $meta['usewordblock']= array('onoff'); -- cgit v1.2.3 From a317247b19c498f4292480110cf0e0a1ce9780e8 Mon Sep 17 00:00:00 2001 From: Dominik Eckelmann Date: Sun, 8 Jan 2012 14:54:53 +0100 Subject: updated remote hasAccess function --- _test/cases/inc/remote.test.php | 46 +++++++++++++++++++++++++++++++++++++++-- inc/remote.php | 13 +++++++++--- 2 files changed, 54 insertions(+), 5 deletions(-) diff --git a/_test/cases/inc/remote.test.php b/_test/cases/inc/remote.test.php index 23186344b..b6a683f45 100644 --- a/_test/cases/inc/remote.test.php +++ b/_test/cases/inc/remote.test.php @@ -99,12 +99,15 @@ class remote_plugin_testplugin extends DokuWiki_Remote_Plugin { class remote_test extends UnitTestCase { var $originalConf; + var $userinfo; var $remote; function setUp() { global $plugin_controller; global $conf; + global $USERINFO; + parent::setUp(); $pluginManager = new MockDoku_Plugin_Controller(); $pluginManager->setReturnValue('getList', array('testplugin')); @@ -112,13 +115,19 @@ class remote_test extends UnitTestCase { $plugin_controller = $pluginManager; $this->originalConf = $conf; + $conf['remote'] = 1; + $conf['useacl'] = 0; + $this->userinfo = $USERINFO; $this->remote = new RemoteAPI(); } function tearDown() { global $conf; + global $USERINFO; $conf = $this->originalConf; + $USERINFO = $this->userinfo; + } function test_pluginMethods() { @@ -131,8 +140,6 @@ class remote_test extends UnitTestCase { } function test_hasAccessSuccess() { - global $conf; - $conf['remote'] = 1; $this->assertTrue($this->remote->hasAccess()); } @@ -142,6 +149,41 @@ class remote_test extends UnitTestCase { $this->assertFalse($this->remote->hasAccess()); } + function test_hasAccessFailAcl() { + global $conf; + $conf['useacl'] = 1; + $this->assertFalse($this->remote->hasAccess()); + } + + function test_hasAccessSuccessAclEmptyRemoteUser() { + global $conf; + $conf['useacl'] = 1; + $conf['remoteuser'] = ''; + + $this->assertTrue($this->remote->hasAccess()); + } + + function test_hasAccessSuccessAcl() { + global $conf; + global $USERINFO; + $conf['useacl'] = 1; + $conf['remoteuser'] = '@grp,@grp2'; + $USERINFO['grps'] = array('grp'); + + $this->assertTrue($this->remote->hasAccess()); + } + + function test_hasAccessFailAcl2() { + global $conf; + global $USERINFO; + $conf['useacl'] = 1; + $conf['remoteuser'] = '@grp'; + $USERINFO['grps'] = array('grp1'); + + $this->assertFalse($this->remote->hasAccess()); + } + + function test_forceAccessSuccess() { global $conf; $conf['remote'] = 1; diff --git a/inc/remote.php b/inc/remote.php index e18c71092..94d428e8c 100644 --- a/inc/remote.php +++ b/inc/remote.php @@ -71,7 +71,6 @@ class RemoteAPI { * @return array with information to all available methods */ public function getMethods() { - $this->forceAccess(); return array_merge($this->getCoreMethods(), $this->getPluginMethods()); } @@ -122,10 +121,18 @@ class RemoteAPI { */ public function hasAccess() { global $conf; - if (!isset($conf['remote'])) { + global $USERINFO; + if (!$conf['remote']) { return false; } - return $conf['remote']; + if(!$conf['useacl']) { + return true; + } + if(trim($conf['remoteuser']) == '') { + return true; + } + + return auth_isMember($conf['remoteuser'], $_SERVER['REMOTE_USER'], (array) $USERINFO['grps']); } /** -- cgit v1.2.3 From 4beb39ea51a46409ab3abd4a1b880bf5d3d5dc4a Mon Sep 17 00:00:00 2001 From: Dominik Eckelmann Date: Sun, 8 Jan 2012 15:31:46 +0100 Subject: enforce acl on remote method call --- _test/cases/inc/remote.test.php | 52 +++++++++++++++++++++++++++++++++++++++-- inc/remote.php | 15 ++++++++++-- 2 files changed, 63 insertions(+), 4 deletions(-) diff --git a/_test/cases/inc/remote.test.php b/_test/cases/inc/remote.test.php index b6a683f45..07ca9d0e8 100644 --- a/_test/cases/inc/remote.test.php +++ b/_test/cases/inc/remote.test.php @@ -54,7 +54,13 @@ class RemoteAPICoreTest { 'return' => 'string', 'doc' => 'Test method', 'name' => 'twoArgWithDefaultArg', - ), + ), 'wiki.publicCall' => array( + 'args' => array(), + 'return' => 'boolean', + 'doc' => 'testing for public access', + 'name' => 'publicCall', + 'public' => 1 + ) ); } function stringTestMethod() { return 'success'; } @@ -66,6 +72,7 @@ class RemoteAPICoreTest { function oneStringArgMethod($arg) {return $arg; } function twoArgMethod($string, $int) { return array($string, $int); } function twoArgWithDefaultArg($string1, $string2 = 'default') { return array($string1, $string2); } + function publicCall() {return true;} } @@ -86,6 +93,12 @@ class remote_plugin_testplugin extends DokuWiki_Remote_Plugin { 'args' => array('string', 'int', 'bool'), 'return' => 'array', 'name' => 'method2', + ), 'publicCall' => array( + 'args' => array(), + 'return' => 'boolean', + 'doc' => 'testing for public access', + 'name' => 'publicCall', + 'public' => 1 ) ); } @@ -93,6 +106,8 @@ class remote_plugin_testplugin extends DokuWiki_Remote_Plugin { function method1() { return null; } function methodString() { return 'success'; } function method2($str, $int, $bool = false) { return array($str, $int, $bool); } + function publicCall() {return true;} + } @@ -134,7 +149,7 @@ class remote_test extends UnitTestCase { $methods = $this->remote->getPluginMethods(); $actual = array_keys($methods); sort($actual); - $expect = array('plugin.testplugin.method1', 'plugin.testplugin.method2', 'plugin.testplugin.methodString', 'plugin.testplugin.method2ext'); + $expect = array('plugin.testplugin.method1', 'plugin.testplugin.method2', 'plugin.testplugin.methodString', 'plugin.testplugin.method2ext', 'plugin.testplugin.publicCall'); sort($expect); $this->assertEqual($expect,$actual); } @@ -253,4 +268,37 @@ class remote_test extends UnitTestCase { $this->expectException('RemoteException'); $remoteApi->call('dose not exist'); } + + function test_publicCallCore() { + global $conf; + $conf['useacl'] = 1; + $remoteApi = new RemoteApi(); + $remoteApi->getCoreMethods(new RemoteAPICoreTest()); + $this->assertTrue($remoteApi->call('wiki.publicCall')); + } + + function test_publicCallPlugin() { + global $conf; + $conf['useacl'] = 1; + $remoteApi = new RemoteApi(); + $this->assertTrue($remoteApi->call('plugin.testplugin.publicCall')); + } + + function test_publicCallCoreDeny() { + global $conf; + $conf['useacl'] = 1; + $remoteApi = new RemoteApi(); + $remoteApi->getCoreMethods(new RemoteAPICoreTest()); + $this->expectException('RemoteAccessDenied'); + $remoteApi->call('wiki.stringTestMethod'); + } + + function test_publicCallPluginDeny() { + global $conf; + $conf['useacl'] = 1; + $remoteApi = new RemoteApi(); + $this->expectException('RemoteAccessDenied'); + $remoteApi->call('plugin.testplugin.methodString'); + } + } diff --git a/inc/remote.php b/inc/remote.php index 94d428e8c..15d2308f8 100644 --- a/inc/remote.php +++ b/inc/remote.php @@ -82,7 +82,6 @@ class RemoteAPI { * @return mixed result of method call, must be a primitive type. */ public function call($method, $args = array()) { - $this->forceAccess(); list($type, $pluginName, $call) = explode('.', $method, 3); if ($type === 'plugin') { $plugin = plugin_load('remote', $pluginName); @@ -90,10 +89,12 @@ class RemoteAPI { if (!$plugin) { throw new RemoteException('Method dose not exists'); } + $this->checkAccess($methods[$method]); $name = $this->getMethodName($methods, $method); return call_user_func_array(array($plugin, $name), $args); } else { $coreMethods = $this->getCoreMethods(); + $this->checkAccess($coreMethods[$method]); if (!isset($coreMethods[$method])) { throw new RemoteException('Method dose not exists'); } @@ -102,6 +103,16 @@ class RemoteAPI { } } + private function checkAccess($methodMeta) { + if (!isset($methodMeta['public'])) { + $this->forceAccess(); + } else{ + if ($methodMeta['public'] == '0') { + $this->forceAccess(); + } + } + } + private function checkArgumentLength($method, $args) { if (count($method['args']) < count($args)) { throw new RemoteException('Method dose not exists - wrong parameter count.'); @@ -141,7 +152,7 @@ class RemoteAPI { */ public function forceAccess() { if (!$this->hasAccess()) { - throw new RemoteException('Access denied'); + throw new RemoteAccessDenied(); } } -- cgit v1.2.3 From 27bf90be7901fc8002eb1f253df9785610d586f1 Mon Sep 17 00:00:00 2001 From: Dominik Eckelmann Date: Sun, 8 Jan 2012 15:56:24 +0100 Subject: set login as public method --- inc/RemoteAPICore.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/inc/RemoteAPICore.php b/inc/RemoteAPICore.php index 106ed598c..023fcb803 100644 --- a/inc/RemoteAPICore.php +++ b/inc/RemoteAPICore.php @@ -14,7 +14,8 @@ class RemoteAPICore { 'password' => 'string' ), 'return' => 'int', - 'doc' => 'Tries to login with the given credentials and sets auth cookies.' + 'doc' => 'Tries to login with the given credentials and sets auth cookies.', + 'public' => '1' ), 'dokuwiki.getPagelist' => array( 'args' => array( 'namespace' => 'string', -- cgit v1.2.3 From 3a13cfe7e12afabb47139702b7f118d63ccf42c2 Mon Sep 17 00:00:00 2001 From: Dominik Eckelmann Date: Sun, 8 Jan 2012 18:10:38 +0100 Subject: set login as public method --- inc/remote.php | 1 + lib/exe/xmlrpc.php | 848 +---------------------------------------------------- 2 files changed, 15 insertions(+), 834 deletions(-) diff --git a/inc/remote.php b/inc/remote.php index 15d2308f8..76d07b344 100644 --- a/inc/remote.php +++ b/inc/remote.php @@ -1,6 +1,7 @@ public_methods[] = $method; - return parent::addCallback($method, $callback, $args, $help); + function dokuwiki_xmlrpc_server(){ + $this->remote = new RemoteAPI(); + $this->IXR_Server(); } - /** - * Execute a call, extends parent method - * - * Checks for authentication first - */ function call($methodname, $args){ - if(!in_array($methodname,$this->public_methods) && !$this->checkAuth()){ + try { + //print 'a'; + $result = $this->remote->call($methodname, $args); + return $result; + } catch (RemoteAccessDenied $e) { if (!isset($_SERVER['REMOTE_USER'])) { header('HTTP/1.1 401 Unauthorized'); } else { header('HTTP/1.1 403 Forbidden'); } - return new IXR_Error(-32603, 'server error. not authorized to call method "'.$methodname.'".'); + return new IXR_Error(-32603, 'server error. not authorized to call method'); + } catch (RemoteException $e) { + return new IXR_Error($e->getCode(), $e->getMessage()); } - return parent::call($methodname, $args); } - /** - * Constructor. Register methods and run Server - */ - function dokuwiki_xmlrpc_server(){ - $this->remote = new RemoteAPI(); - $this->IXR_IntrospectionServer(); - - /* DokuWiki's own methods */ - $this->addCallback( - 'dokuwiki.getXMLRPCAPIVersion', - 'this:getAPIVersion', - array('integer'), - 'Returns the XMLRPC API version.', - true - ); - - $this->addCallback( - 'dokuwiki.getVersion', - 'getVersion', - array('string'), - 'Returns the running DokuWiki version.', - true - ); - - $this->addCallback( - 'dokuwiki.login', - 'this:login', - array('integer','string','string'), - 'Tries to login with the given credentials and sets auth cookies.', - true - ); - - $this->addCallback( - 'dokuwiki.getPagelist', - 'this:readNamespace', - array('struct','string','struct'), - 'List all pages within the given namespace.' - ); - - $this->addCallback( - 'dokuwiki.search', - 'this:search', - array('struct','string'), - 'Perform a fulltext search and return a list of matching pages' - ); - - $this->addCallback( - 'dokuwiki.getTime', - 'time', - array('int'), - 'Return the current time at the wiki server.' - ); - - $this->addCallback( - 'dokuwiki.setLocks', - 'this:setLocks', - array('struct','struct'), - 'Lock or unlock pages.' - ); - - - $this->addCallback( - 'dokuwiki.getTitle', - 'this:getTitle', - array('string'), - 'Returns the wiki title.', - true - ); - - $this->addCallback( - 'dokuwiki.appendPage', - 'this:appendPage', - array('int', 'string', 'string', 'struct'), - 'Append text to a wiki page.' - ); - - /* Wiki API v2 http://www.jspwiki.org/wiki/WikiRPCInterface2 */ - $this->addCallback( - 'wiki.getRPCVersionSupported', - 'this:wiki_RPCVersion', - array('int'), - 'Returns 2 with the supported RPC API version.', - true - ); - $this->addCallback( - 'wiki.getPage', - 'this:rawPage', - array('string','string'), - 'Get the raw Wiki text of page, latest version.' - ); - $this->addCallback( - 'wiki.getPageVersion', - 'this:rawPage', - array('string','string','int'), - 'Get the raw Wiki text of page.' - ); - $this->addCallback( - 'wiki.getPageHTML', - 'this:htmlPage', - array('string','string'), - 'Return page in rendered HTML, latest version.' - ); - $this->addCallback( - 'wiki.getPageHTMLVersion', - 'this:htmlPage', - array('string','string','int'), - 'Return page in rendered HTML.' - ); - $this->addCallback( - 'wiki.getAllPages', - 'this:listPages', - array('struct'), - 'Returns a list of all pages. The result is an array of utf8 pagenames.' - ); - $this->addCallback( - 'wiki.getAttachments', - 'this:listAttachments', - array('struct', 'string', 'struct'), - 'Returns a list of all media files.' - ); - $this->addCallback( - 'wiki.getBackLinks', - 'this:listBackLinks', - array('struct','string'), - 'Returns the pages that link to this page.' - ); - $this->addCallback( - 'wiki.getPageInfo', - 'this:pageInfo', - array('struct','string'), - 'Returns a struct with infos about the page.' - ); - $this->addCallback( - 'wiki.getPageInfoVersion', - 'this:pageInfo', - array('struct','string','int'), - 'Returns a struct with infos about the page.' - ); - $this->addCallback( - 'wiki.getPageVersions', - 'this:pageVersions', - array('struct','string','int'), - 'Returns the available revisions of the page.' - ); - $this->addCallback( - 'wiki.putPage', - 'this:putPage', - array('int', 'string', 'string', 'struct'), - 'Saves a wiki page.' - ); - $this->addCallback( - 'wiki.listLinks', - 'this:listLinks', - array('struct','string'), - 'Lists all links contained in a wiki page.' - ); - $this->addCallback( - 'wiki.getRecentChanges', - 'this:getRecentChanges', - array('struct','int'), - 'Returns a struct about all recent changes since given timestamp.' - ); - $this->addCallback( - 'wiki.getRecentMediaChanges', - 'this:getRecentMediaChanges', - array('struct','int'), - 'Returns a struct about all recent media changes since given timestamp.' - ); - $this->addCallback( - 'wiki.aclCheck', - 'this:aclCheck', - array('int', 'string'), - 'Returns the permissions of a given wiki page.' - ); - $this->addCallback( - 'wiki.putAttachment', - 'this:putAttachment', - array('struct', 'string', 'base64', 'struct'), - 'Upload a file to the wiki.' - ); - $this->addCallback( - 'wiki.deleteAttachment', - 'this:deleteAttachment', - array('int', 'string'), - 'Delete a file from the wiki.' - ); - $this->addCallback( - 'wiki.getAttachment', - 'this:getAttachment', - array('base64', 'string'), - 'Download a file from the wiki.' - ); - $this->addCallback( - 'wiki.getAttachmentInfo', - 'this:getAttachmentInfo', - array('struct', 'string'), - 'Returns a struct with infos about the attachment.' - ); - - /** - * Trigger XMLRPC_CALLBACK_REGISTER, action plugins can use this event - * to extend the XMLRPC interface and register their own callbacks. - * - * Event data: - * The XMLRPC server object: - * - * $event->data->addCallback() - register a callback, the second - * paramter has to be of the form "plugin::" - * - * $event->data->callbacks - an array which holds all awaylable - * callbacks - */ - trigger_event('XMLRPC_CALLBACK_REGISTER', $this); - - $this->serve(); - } - - /** - * Return a raw wiki page - */ - function rawPage($id,$rev=''){ - try { - return $this->remote->rawPage($id, $rev); - } catch(RemoteAccessDenied $e) { - return new IXR_Error(1, 'You are not allowed to read this page'); - } - } - - /** - * Return a media file encoded in base64 - * - * @author Gina Haeussge - */ - function getAttachment($id){ - try { - try { - return $this->remote->getAttachment($id); - } catch (RemoteAccessDenied $e) { - return new IXR_Error(1, 'You are not allowed to read this file'); - } - } - catch (RemoteException $e) { - return new IXR_Error(1, $e->getMessage()); - } - } - - /** - * Return info about a media file - * - * @author Gina Haeussge - */ - function getAttachmentInfo($id){ - $info = $this->remote->getAttachmentInfo($id); - $info['lastModified'] = new IXR_Date($info['lastModified']); - return $info; - } - - /** - * Return a wiki page rendered to html - */ - function htmlPage($id,$rev=''){ - $id = cleanID($id); - if(auth_quickaclcheck($id) < AUTH_READ){ - return new IXR_Error(1, 'You are not allowed to read this page'); - } - return p_wiki_xhtml($id,$rev,false); - } - - /** - * List all pages - we use the indexer list here - */ - function listPages(){ - $list = array(); - $pages = idx_get_indexer()->getPages(); - $pages = array_filter(array_filter($pages,'isVisiblePage'),'page_exists'); - - foreach(array_keys($pages) as $idx) { - $perm = auth_quickaclcheck($pages[$idx]); - if($perm < AUTH_READ) { - continue; - } - $page = array(); - $page['id'] = trim($pages[$idx]); - $page['perms'] = $perm; - $page['size'] = @filesize(wikiFN($pages[$idx])); - $page['lastModified'] = new IXR_Date(@filemtime(wikiFN($pages[$idx]))); - $list[] = $page; - } - - return $list; - } - - /** - * List all pages in the given namespace (and below) - */ - function readNamespace($ns,$opts){ - global $conf; - - if(!is_array($opts)) $opts=array(); - - $ns = cleanID($ns); - $dir = utf8_encodeFN(str_replace(':', '/', $ns)); - $data = array(); - $opts['skipacl'] = 0; // no ACL skipping for XMLRPC - search($data, $conf['datadir'], 'search_allpages', $opts, $dir); - return $data; - } - - /** - * List all pages in the given namespace (and below) - */ - function search($query){ - require_once(DOKU_INC.'inc/fulltext.php'); - - $regex = ''; - $data = ft_pageSearch($query,$regex); - $pages = array(); - - // prepare additional data - $idx = 0; - foreach($data as $id => $score){ - $file = wikiFN($id); - - if($idx < FT_SNIPPET_NUMBER){ - $snippet = ft_snippet($id,$regex); - $idx++; - }else{ - $snippet = ''; - } - - $pages[] = array( - 'id' => $id, - 'score' => $score, - 'rev' => filemtime($file), - 'mtime' => filemtime($file), - 'size' => filesize($file), - 'snippet' => $snippet, - ); - } - return $pages; - } - - /** - * Returns the wiki title. - */ - function getTitle(){ - global $conf; - return $conf['title']; - } - - /** - * List all media files. - * - * Available options are 'recursive' for also including the subnamespaces - * in the listing, and 'pattern' for filtering the returned files against - * a regular expression matching their name. - * - * @author Gina Haeussge - */ - function listAttachments($ns, $options = array()) { - global $conf; - global $lang; - - $ns = cleanID($ns); - - if (!is_array($options)) $options = array(); - $options['skipacl'] = 0; // no ACL skipping for XMLRPC - - - if(auth_quickaclcheck($ns.':*') >= AUTH_READ) { - $dir = utf8_encodeFN(str_replace(':', '/', $ns)); - - $data = array(); - search($data, $conf['mediadir'], 'search_media', $options, $dir); - $len = count($data); - if(!$len) return array(); - - for($i=0; $i<$len; $i++) { - unset($data[$i]['meta']); - $data[$i]['lastModified'] = new IXR_Date($data[$i]['mtime']); - } - return $data; - } else { - return new IXR_Error(1, 'You are not allowed to list media files.'); - } - } - - /** - * Return a list of backlinks - */ - function listBackLinks($id){ - return ft_backlinks(cleanID($id)); - } - - /** - * Return some basic data about a page - */ - function pageInfo($id,$rev=''){ - $id = cleanID($id); - if(auth_quickaclcheck($id) < AUTH_READ){ - return new IXR_Error(1, 'You are not allowed to read this page'); - } - $file = wikiFN($id,$rev); - $time = @filemtime($file); - if(!$time){ - return new IXR_Error(10, 'The requested page does not exist'); - } - - $info = getRevisionInfo($id, $time, 1024); - - $data = array( - 'name' => $id, - 'lastModified' => new IXR_Date($time), - 'author' => (($info['user']) ? $info['user'] : $info['ip']), - 'version' => $time - ); - - return ($data); - } - - /** - * Save a wiki page - * - * @author Michael Klier - */ - function putPage($id, $text, $params) { - global $TEXT; - global $lang; - global $conf; - - $id = cleanID($id); - $TEXT = cleanText($text); - $sum = $params['sum']; - $minor = $params['minor']; - - if(empty($id)) - return new IXR_Error(1, 'Empty page ID'); - - if(!page_exists($id) && trim($TEXT) == '' ) { - return new IXR_ERROR(1, 'Refusing to write an empty new wiki page'); - } - - if(auth_quickaclcheck($id) < AUTH_EDIT) - return new IXR_Error(1, 'You are not allowed to edit this page'); - - // Check, if page is locked - if(checklock($id)) - return new IXR_Error(1, 'The page is currently locked'); - - // SPAM check - if(checkwordblock()) - return new IXR_Error(1, 'Positive wordblock check'); - - // autoset summary on new pages - if(!page_exists($id) && empty($sum)) { - $sum = $lang['created']; - } - - // autoset summary on deleted pages - if(page_exists($id) && empty($TEXT) && empty($sum)) { - $sum = $lang['deleted']; - } - - lock($id); - - saveWikiText($id,$TEXT,$sum,$minor); - - unlock($id); - - // run the indexer if page wasn't indexed yet - idx_addPage($id); - - return 0; - } - - /** - * Appends text to a wiki page. - */ - function appendPage($id, $text, $params) { - $currentpage = $this->rawPage($id); - if (!is_string($currentpage)) { - return $currentpage; - } - return $this->putPage($id, $currentpage.$text, $params); - } - - /** - * Uploads a file to the wiki. - * - * Michael Klier - */ - function putAttachment($id, $file, $params) { - $id = cleanID($id); - $auth = auth_quickaclcheck(getNS($id).':*'); - - if(!isset($id)) { - return new IXR_ERROR(1, 'Filename not given.'); - } - - global $conf; - - $ftmp = $conf['tmpdir'] . '/' . md5($id.clientIP()); - - // save temporary file - @unlink($ftmp); - if (preg_match('/^[A-Za-z0-9\+\/]*={0,2}$/', $file) === 1) { - // DEPRECATED: Double-decode file if it still looks like base64 - // after first decoding (which is done by the library) - $file = base64_decode($file); - } - io_saveFile($ftmp, $file); - - $res = media_save(array('name' => $ftmp), $id, $params['ow'], $auth, 'rename'); - if (is_array($res)) { - return new IXR_ERROR(-$res[1], $res[0]); - } else { - return $res; - } - } - - /** - * Deletes a file from the wiki. - * - * @author Gina Haeussge - */ - function deleteAttachment($id){ - $id = cleanID($id); - $auth = auth_quickaclcheck(getNS($id).':*'); - $res = media_delete($id, $auth); - if ($res & DOKU_MEDIA_DELETED) { - return 0; - } elseif ($res & DOKU_MEDIA_NOT_AUTH) { - return new IXR_ERROR(1, "You don't have permissions to delete files."); - } elseif ($res & DOKU_MEDIA_INUSE) { - return new IXR_ERROR(1, 'File is still referenced'); - } else { - return new IXR_ERROR(1, 'Could not delete file'); - } - } - - /** - * Returns the permissions of a given wiki page - */ - function aclCheck($id) { - $id = cleanID($id); - return auth_quickaclcheck($id); - } - - /** - * Lists all links contained in a wiki page - * - * @author Michael Klier - */ - function listLinks($id) { - $id = cleanID($id); - if(auth_quickaclcheck($id) < AUTH_READ){ - return new IXR_Error(1, 'You are not allowed to read this page'); - } - $links = array(); - - // resolve page instructions - $ins = p_cached_instructions(wikiFN($id)); - - // instantiate new Renderer - needed for interwiki links - include(DOKU_INC.'inc/parser/xhtml.php'); - $Renderer = new Doku_Renderer_xhtml(); - $Renderer->interwiki = getInterwiki(); - - // parse parse instructions - foreach($ins as $in) { - $link = array(); - switch($in[0]) { - case 'internallink': - $link['type'] = 'local'; - $link['page'] = $in[1][0]; - $link['href'] = wl($in[1][0]); - array_push($links,$link); - break; - case 'externallink': - $link['type'] = 'extern'; - $link['page'] = $in[1][0]; - $link['href'] = $in[1][0]; - array_push($links,$link); - break; - case 'interwikilink': - $url = $Renderer->_resolveInterWiki($in[1][2],$in[1][3]); - $link['type'] = 'extern'; - $link['page'] = $url; - $link['href'] = $url; - array_push($links,$link); - break; - } - } - - return ($links); - } - - /** - * Returns a list of recent changes since give timestamp - * - * @author Michael Hamann - * @author Michael Klier - */ - function getRecentChanges($timestamp) { - if(strlen($timestamp) != 10) - return new IXR_Error(20, 'The provided value is not a valid timestamp'); - - $recents = getRecentsSince($timestamp); - - $changes = array(); - - foreach ($recents as $recent) { - $change = array(); - $change['name'] = $recent['id']; - $change['lastModified'] = new IXR_Date($recent['date']); - $change['author'] = $recent['user']; - $change['version'] = $recent['date']; - $change['perms'] = $recent['perms']; - $change['size'] = @filesize(wikiFN($recent['id'])); - array_push($changes, $change); - } - - if (!empty($changes)) { - return $changes; - } else { - // in case we still have nothing at this point - return new IXR_Error(30, 'There are no changes in the specified timeframe'); - } - } - - /** - * Returns a list of recent media changes since give timestamp - * - * @author Michael Hamann - * @author Michael Klier - */ - function getRecentMediaChanges($timestamp) { - if(strlen($timestamp) != 10) - return new IXR_Error(20, 'The provided value is not a valid timestamp'); - - $recents = getRecentsSince($timestamp, null, '', RECENTS_MEDIA_CHANGES); - - $changes = array(); - - foreach ($recents as $recent) { - $change = array(); - $change['name'] = $recent['id']; - $change['lastModified'] = new IXR_Date($recent['date']); - $change['author'] = $recent['user']; - $change['version'] = $recent['date']; - $change['perms'] = $recent['perms']; - $change['size'] = @filesize(mediaFN($recent['id'])); - array_push($changes, $change); - } - - if (!empty($changes)) { - return $changes; - } else { - // in case we still have nothing at this point - return new IXR_Error(30, 'There are no changes in the specified timeframe'); - } - } - - /** - * Returns a list of available revisions of a given wiki page - * - * @author Michael Klier - */ - function pageVersions($id, $first) { - $id = cleanID($id); - if(auth_quickaclcheck($id) < AUTH_READ){ - return new IXR_Error(1, 'You are not allowed to read this page'); - } - global $conf; - - $versions = array(); - - if(empty($id)) - return new IXR_Error(1, 'Empty page ID'); - - $revisions = getRevisions($id, $first, $conf['recent']+1); - - if(count($revisions)==0 && $first!=0) { - $first=0; - $revisions = getRevisions($id, $first, $conf['recent']+1); - } - - if(count($revisions)>0 && $first==0) { - array_unshift($revisions, ''); // include current revision - array_pop($revisions); // remove extra log entry - } - - $hasNext = false; - if(count($revisions)>$conf['recent']) { - $hasNext = true; - array_pop($revisions); // remove extra log entry - } - - if(!empty($revisions)) { - foreach($revisions as $rev) { - $file = wikiFN($id,$rev); - $time = @filemtime($file); - // we check if the page actually exists, if this is not the - // case this can lead to less pages being returned than - // specified via $conf['recent'] - if($time){ - $info = getRevisionInfo($id, $time, 1024); - if(!empty($info)) { - $data['user'] = $info['user']; - $data['ip'] = $info['ip']; - $data['type'] = $info['type']; - $data['sum'] = $info['sum']; - $data['modified'] = new IXR_Date($info['date']); - $data['version'] = $info['date']; - array_push($versions, $data); - } - } - } - return $versions; - } else { - return array(); - } - } - - /** - * The version of Wiki RPC API supported - */ - function wiki_RPCVersion(){ - return 2; - } - - - /** - * Locks or unlocks a given batch of pages - * - * Give an associative array with two keys: lock and unlock. Both should contain a - * list of pages to lock or unlock - * - * Returns an associative array with the keys locked, lockfail, unlocked and - * unlockfail, each containing lists of pages. - */ - function setLocks($set){ - $locked = array(); - $lockfail = array(); - $unlocked = array(); - $unlockfail = array(); - - foreach((array) $set['lock'] as $id){ - $id = cleanID($id); - if(auth_quickaclcheck($id) < AUTH_EDIT || checklock($id)){ - $lockfail[] = $id; - }else{ - lock($id); - $locked[] = $id; - } - } - - foreach((array) $set['unlock'] as $id){ - $id = cleanID($id); - if(auth_quickaclcheck($id) < AUTH_EDIT || !unlock($id)){ - $unlockfail[] = $id; - }else{ - $unlocked[] = $id; - } - } - - return array( - 'locked' => $locked, - 'lockfail' => $lockfail, - 'unlocked' => $unlocked, - 'unlockfail' => $unlockfail, - ); - } - - function getAPIVersion(){ - return DOKU_XMLRPC_API_VERSION; - } - - function login($user,$pass){ - global $conf; - global $auth; - if(!$conf['useacl']) return 0; - if(!$auth) return 0; - - @session_start(); // reopen session for login - if($auth->canDo('external')){ - $ok = $auth->trustExternal($user,$pass,false); - }else{ - $evdata = array( - 'user' => $user, - 'password' => $pass, - 'sticky' => false, - 'silent' => true, - ); - $ok = trigger_event('AUTH_LOGIN_CHECK', $evdata, 'auth_login_wrapper'); - } - session_write_close(); // we're done with the session - - return $ok; - } - - } $server = new dokuwiki_xmlrpc_server(); -- cgit v1.2.3 From bb680e43a5c33747ab844580e1e80c4fdc2fe580 Mon Sep 17 00:00:00 2001 From: Dominik Eckelmann Date: Sun, 8 Jan 2012 18:14:44 +0100 Subject: added missing getVersion --- inc/RemoteAPICore.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/inc/RemoteAPICore.php b/inc/RemoteAPICore.php index 023fcb803..6b665e083 100644 --- a/inc/RemoteAPICore.php +++ b/inc/RemoteAPICore.php @@ -171,6 +171,10 @@ class RemoteAPICore { ); } + function getVersion() { + return getVersion(); + } + /** * Return a raw wiki page * @param string $id wiki page id -- cgit v1.2.3 From cb0d045e79603fb7f0c6703aaf633c8d0e34c117 Mon Sep 17 00:00:00 2001 From: Dominik Eckelmann Date: Sun, 8 Jan 2012 18:21:48 +0100 Subject: added missing getTime --- inc/RemoteAPICore.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/inc/RemoteAPICore.php b/inc/RemoteAPICore.php index 6b665e083..a19c1b84e 100644 --- a/inc/RemoteAPICore.php +++ b/inc/RemoteAPICore.php @@ -175,6 +175,10 @@ class RemoteAPICore { return getVersion(); } + function getTime() { + return time(); + } + /** * Return a raw wiki page * @param string $id wiki page id -- cgit v1.2.3 From 1232df5e9480465ff8b2e24ce5760766b3bd908c Mon Sep 17 00:00:00 2001 From: Dominik Eckelmann Date: Sun, 8 Jan 2012 18:27:27 +0100 Subject: treat null as empty array --- inc/remote.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/inc/remote.php b/inc/remote.php index 76d07b344..c18cb3713 100644 --- a/inc/remote.php +++ b/inc/remote.php @@ -83,6 +83,9 @@ class RemoteAPI { * @return mixed result of method call, must be a primitive type. */ public function call($method, $args = array()) { + if ($args === null) { + $args = array(); + } list($type, $pluginName, $call) = explode('.', $method, 3); if ($type === 'plugin') { $plugin = plugin_load('remote', $pluginName); -- cgit v1.2.3 From f95017850a515969190f54df3d57a00449245bb9 Mon Sep 17 00:00:00 2001 From: Dominik Eckelmann Date: Sun, 8 Jan 2012 18:37:59 +0100 Subject: delegate file and date transformation to remote library --- inc/RemoteAPICore.php | 26 ++++++++++++++++---------- inc/remote.php | 33 +++++++++++++++++++++++++++++---- lib/exe/xmlrpc.php | 10 ++++++++++ 3 files changed, 55 insertions(+), 14 deletions(-) diff --git a/inc/RemoteAPICore.php b/inc/RemoteAPICore.php index a19c1b84e..639aa4536 100644 --- a/inc/RemoteAPICore.php +++ b/inc/RemoteAPICore.php @@ -2,6 +2,12 @@ class RemoteAPICore { + private $api; + + public function __construct(RemoteAPI $api) { + $this->api = $api; + } + function __getRemoteInfo() { return array( 'dokuwiki.getVersion' => array( @@ -217,7 +223,7 @@ class RemoteAPICore { } $data = io_readFile($file, false); - return new RemoteFile($data); + return $this->api->toFile($data); } /** @@ -228,13 +234,13 @@ class RemoteAPICore { function getAttachmentInfo($id){ $id = cleanID($id); $info = array( - 'lastModified' => new RemoteDate(0), + 'lastModified' => $this->api->toDate(0), 'size' => 0, ); $file = mediaFN($id); if ((auth_quickaclcheck(getNS($id).':*') >= AUTH_READ) && file_exists($file)){ - $info['lastModified'] = new RemoteDate(filemtime($file)); + $info['lastModified'] = $this->api->toDate(filemtime($file)); $info['size'] = filesize($file); } @@ -269,7 +275,7 @@ class RemoteAPICore { $page['id'] = trim($pages[$idx]); $page['perms'] = $perm; $page['size'] = @filesize(wikiFN($pages[$idx])); - $page['lastModified'] = new RemoteDate(@filemtime(wikiFN($pages[$idx]))); + $page['lastModified'] = $this->api->toDate(@filemtime(wikiFN($pages[$idx]))); $list[] = $page; } @@ -362,7 +368,7 @@ class RemoteAPICore { for($i=0; $i<$len; $i++) { unset($data[$i]['meta']); - $data[$i]['lastModified'] = new RemoteDate($data[$i]['mtime']); + $data[$i]['lastModified'] = $this->api->toDate($data[$i]['mtime']); } return $data; } else { @@ -395,7 +401,7 @@ class RemoteAPICore { $data = array( 'name' => $id, - 'lastModified' => new RemoteDate($time), + 'lastModified' => $this->api->toDate($time), 'author' => (($info['user']) ? $info['user'] : $info['ip']), 'version' => $time ); @@ -477,7 +483,7 @@ class RemoteAPICore { * * Michael Klier */ - function putAttachment($id, RemoteFile $file, $params) { + function putAttachment($id, $file, $params) { $id = cleanID($id); $auth = auth_quickaclcheck(getNS($id).':*'); @@ -596,7 +602,7 @@ class RemoteAPICore { foreach ($recents as $recent) { $change = array(); $change['name'] = $recent['id']; - $change['lastModified'] = new RemoteDate($recent['date']); + $change['lastModified'] = $this->api->toDate($recent['date']); $change['author'] = $recent['user']; $change['version'] = $recent['date']; $change['perms'] = $recent['perms']; @@ -629,7 +635,7 @@ class RemoteAPICore { foreach ($recents as $recent) { $change = array(); $change['name'] = $recent['id']; - $change['lastModified'] = new RemoteDate($recent['date']); + $change['lastModified'] = $this->api->toDate($recent['date']); $change['author'] = $recent['user']; $change['version'] = $recent['date']; $change['perms'] = $recent['perms']; @@ -693,7 +699,7 @@ class RemoteAPICore { $data['ip'] = $info['ip']; $data['type'] = $info['type']; $data['sum'] = $info['sum']; - $data['modified'] = new RemoteDate($info['date']); + $data['modified'] = $this->api->toDate($info['date']); $data['version'] = $info['date']; array_push($versions, $data); } diff --git a/inc/remote.php b/inc/remote.php index c18cb3713..71ceb97b5 100644 --- a/inc/remote.php +++ b/inc/remote.php @@ -18,9 +18,6 @@ abstract class RemoteDataType { } } -class RemoteDate extends RemoteDataType {} -class RemoteFile extends RemoteDataType {} - /** * This class provides information about remote access to the wiki. * @@ -66,6 +63,14 @@ class RemoteAPI { */ private $pluginMethods = null; + private $dateTransformation; + private $fileTransformation; + + public function __construct() { + $this->dateTransformation = array($this, 'dummyTransformation'); + $this->fileTransformation = array($this, 'dummyTransformation'); + } + /** * Get all available methods with remote access. * @@ -191,11 +196,31 @@ class RemoteAPI { public function getCoreMethods($apiCore = null) { if ($this->coreMethods === null) { if ($apiCore === null) { - $this->coreMethods = new RemoteAPICore(); + $this->coreMethods = new RemoteAPICore($this); } else { $this->coreMethods = $apiCore; } } return $this->coreMethods->__getRemoteInfo(); } + + public function toFile($data) { + return call_user_func($this->fileTransformation, $data); + } + + public function toDate($data) { + return call_user_func($this->dateTransformation, $data); + } + + public function dummyTransformation($data) { + return $data; + } + + public function setDateTransformation($dateTransformation) { + $this->dateTransformation = $dateTransformation; + } + + public function setFileTransformation($fileTransformation) { + $this->fileTransformation = $fileTransformation; + } } \ No newline at end of file diff --git a/lib/exe/xmlrpc.php b/lib/exe/xmlrpc.php index 9888c9a61..44b4ba7a0 100644 --- a/lib/exe/xmlrpc.php +++ b/lib/exe/xmlrpc.php @@ -27,6 +27,8 @@ class dokuwiki_xmlrpc_server extends IXR_Server { */ function dokuwiki_xmlrpc_server(){ $this->remote = new RemoteAPI(); + $this->remote->setDateTransformation(array($this, 'toDate')); + $this->remote->setFileTransformation(array($this, 'toFile')); $this->IXR_Server(); } @@ -47,6 +49,14 @@ class dokuwiki_xmlrpc_server extends IXR_Server { } } + function toDate($data) { + return new IXR_Date($data); + } + + function toFile($data) { + return new IXR_Base64($data); + } + } $server = new dokuwiki_xmlrpc_server(); -- cgit v1.2.3 From 6e8160489a60f00eb756682b574be72693c7878b Mon Sep 17 00:00:00 2001 From: Dominik Eckelmann Date: Sun, 8 Jan 2012 19:29:39 +0100 Subject: adjusted test cases --- _test/cases/inc/remote.test.php | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/_test/cases/inc/remote.test.php b/_test/cases/inc/remote.test.php index 07ca9d0e8..c4f0cd2c2 100644 --- a/_test/cases/inc/remote.test.php +++ b/_test/cases/inc/remote.test.php @@ -66,8 +66,8 @@ class RemoteAPICoreTest { function stringTestMethod() { return 'success'; } function intTestMethod() { return 42; } function floatTestMethod() { return 3.14159265; } - function dateTestMethod() { return new RemoteDate(2623452346); } - function fileTestMethod() { return new RemoteFile('file content'); } + function dateTestMethod() { return 2623452346; } + function fileTestMethod() { return 'file content'; } function voidTestMethod() { return null; } function oneStringArgMethod($arg) {return $arg; } function twoArgMethod($string, $int) { return array($string, $int); } @@ -131,6 +131,7 @@ class remote_test extends UnitTestCase { $this->originalConf = $conf; $conf['remote'] = 1; + $conf['remoteuser'] = '!!not set!!'; $conf['useacl'] = 0; $this->userinfo = $USERINFO; @@ -221,8 +222,8 @@ class remote_test extends UnitTestCase { $this->assertEqual($remoteApi->call('wiki.stringTestMethod'), 'success'); $this->assertEqual($remoteApi->call('wiki.intTestMethod'), 42); $this->assertEqual($remoteApi->call('wiki.floatTestMethod'), 3.14159265); - $this->assertEqual($remoteApi->call('wiki.dateTestMethod'), new RemoteDate(2623452346)); - $this->assertEqual($remoteApi->call('wiki.fileTestMethod'), new RemoteFile('file content')); + $this->assertEqual($remoteApi->call('wiki.dateTestMethod'), 2623452346); + $this->assertEqual($remoteApi->call('wiki.fileTestMethod'), 'file content'); $this->assertEqual($remoteApi->call('wiki.voidTestMethod'), null); } -- cgit v1.2.3 From e61127e4af913a252fbe5c8f427501268501895c Mon Sep 17 00:00:00 2001 From: Dominik Eckelmann Date: Sun, 8 Jan 2012 19:31:10 +0100 Subject: refactored RemoteAccessDenied to RemoteAccessDeniedException --- _test/cases/inc/remote.test.php | 4 ++-- inc/RemoteAPICore.php | 18 +++++++++--------- inc/remote.php | 4 ++-- lib/exe/xmlrpc.php | 2 +- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/_test/cases/inc/remote.test.php b/_test/cases/inc/remote.test.php index c4f0cd2c2..f5da3c06d 100644 --- a/_test/cases/inc/remote.test.php +++ b/_test/cases/inc/remote.test.php @@ -290,7 +290,7 @@ class remote_test extends UnitTestCase { $conf['useacl'] = 1; $remoteApi = new RemoteApi(); $remoteApi->getCoreMethods(new RemoteAPICoreTest()); - $this->expectException('RemoteAccessDenied'); + $this->expectException('RemoteAccessDeniedException'); $remoteApi->call('wiki.stringTestMethod'); } @@ -298,7 +298,7 @@ class remote_test extends UnitTestCase { global $conf; $conf['useacl'] = 1; $remoteApi = new RemoteApi(); - $this->expectException('RemoteAccessDenied'); + $this->expectException('RemoteAccessDeniedException'); $remoteApi->call('plugin.testplugin.methodString'); } diff --git a/inc/RemoteAPICore.php b/inc/RemoteAPICore.php index 639aa4536..2fecc3032 100644 --- a/inc/RemoteAPICore.php +++ b/inc/RemoteAPICore.php @@ -194,7 +194,7 @@ class RemoteAPICore { function rawPage($id,$rev=''){ $id = cleanID($id); if(auth_quickaclcheck($id) < AUTH_READ){ - throw new RemoteAccessDenied(); + throw new RemoteAccessDeniedException(); } $text = rawWiki($id,$rev); if(!$text) { @@ -214,7 +214,7 @@ class RemoteAPICore { function getAttachment($id){ $id = cleanID($id); if (auth_quickaclcheck(getNS($id).':*') < AUTH_READ) { - throw new RemoteAccessDenied(); + throw new RemoteAccessDeniedException(); } $file = mediaFN($id); @@ -253,7 +253,7 @@ class RemoteAPICore { function htmlPage($id,$rev=''){ $id = cleanID($id); if(auth_quickaclcheck($id) < AUTH_READ){ - throw new RemoteAccessDenied(1, 'You are not allowed to read this page'); + throw new RemoteAccessDeniedException(1, 'You are not allowed to read this page'); } return p_wiki_xhtml($id,$rev,false); } @@ -372,7 +372,7 @@ class RemoteAPICore { } return $data; } else { - throw new RemoteAccessDenied(1, 'You are not allowed to list media files.'); + throw new RemoteAccessDeniedException(1, 'You are not allowed to list media files.'); } } @@ -389,7 +389,7 @@ class RemoteAPICore { function pageInfo($id,$rev=''){ $id = cleanID($id); if(auth_quickaclcheck($id) < AUTH_READ){ - throw new RemoteAccessDenied(1, 'You are not allowed to read this page'); + throw new RemoteAccessDeniedException(1, 'You are not allowed to read this page'); } $file = wikiFN($id,$rev); $time = @filemtime($file); @@ -432,7 +432,7 @@ class RemoteAPICore { } if(auth_quickaclcheck($id) < AUTH_EDIT) { - throw new RemoteAccessDenied(1, 'You are not allowed to edit this page'); + throw new RemoteAccessDeniedException(1, 'You are not allowed to edit this page'); } // Check, if page is locked @@ -519,7 +519,7 @@ class RemoteAPICore { if ($res & DOKU_MEDIA_DELETED) { return 0; } elseif ($res & DOKU_MEDIA_NOT_AUTH) { - throw new RemoteAccessDenied(1, "You don't have permissions to delete files."); + throw new RemoteAccessDeniedException(1, "You don't have permissions to delete files."); } elseif ($res & DOKU_MEDIA_INUSE) { throw new RemoteException(1, 'File is still referenced'); } else { @@ -543,7 +543,7 @@ class RemoteAPICore { function listLinks($id) { $id = cleanID($id); if(auth_quickaclcheck($id) < AUTH_READ){ - throw new RemoteAccessDenied(1, 'You are not allowed to read this page'); + throw new RemoteAccessDeniedException(1, 'You are not allowed to read this page'); } $links = array(); @@ -659,7 +659,7 @@ class RemoteAPICore { function pageVersions($id, $first) { $id = cleanID($id); if(auth_quickaclcheck($id) < AUTH_READ) { - throw new RemoteAccessDenied(1, 'You are not allowed to read this page'); + throw new RemoteAccessDeniedException(1, 'You are not allowed to read this page'); } global $conf; diff --git a/inc/remote.php b/inc/remote.php index 71ceb97b5..8c505911c 100644 --- a/inc/remote.php +++ b/inc/remote.php @@ -4,7 +4,7 @@ if (!defined('DOKU_INC')) die(); require_once(DOKU_INC.'inc/RemoteAPICore.php'); class RemoteException extends Exception {} -class RemoteAccessDenied extends RemoteException {} +class RemoteAccessDeniedException extends RemoteException {} abstract class RemoteDataType { private $value; @@ -161,7 +161,7 @@ class RemoteAPI { */ public function forceAccess() { if (!$this->hasAccess()) { - throw new RemoteAccessDenied(); + throw new RemoteAccessDeniedException(); } } diff --git a/lib/exe/xmlrpc.php b/lib/exe/xmlrpc.php index 44b4ba7a0..ce9ef1484 100644 --- a/lib/exe/xmlrpc.php +++ b/lib/exe/xmlrpc.php @@ -37,7 +37,7 @@ class dokuwiki_xmlrpc_server extends IXR_Server { //print 'a'; $result = $this->remote->call($methodname, $args); return $result; - } catch (RemoteAccessDenied $e) { + } catch (RemoteAccessDeniedException $e) { if (!isset($_SERVER['REMOTE_USER'])) { header('HTTP/1.1 401 Unauthorized'); } else { -- cgit v1.2.3 From d5d19f6f45af17260583d7f7a8e753343afbaaad Mon Sep 17 00:00:00 2001 From: "Oscar M. Lage" Date: Mon, 9 Jan 2012 19:02:36 +0100 Subject: Galician language update --- inc/lang/gl/lang.php | 91 ++++++++++++++++++++++------ lib/plugins/acl/lang/gl/lang.php | 1 + lib/plugins/config/lang/gl/lang.php | 7 +++ lib/plugins/plugin/lang/gl/lang.php | 2 + lib/plugins/popularity/lang/gl/lang.php | 6 ++ lib/plugins/popularity/lang/gl/submitted.txt | 3 + lib/plugins/revert/lang/gl/lang.php | 1 + lib/plugins/usermanager/lang/gl/lang.php | 1 + 8 files changed, 93 insertions(+), 19 deletions(-) create mode 100644 lib/plugins/popularity/lang/gl/submitted.txt diff --git a/inc/lang/gl/lang.php b/inc/lang/gl/lang.php index 01938b3a0..a4c218510 100644 --- a/inc/lang/gl/lang.php +++ b/inc/lang/gl/lang.php @@ -4,6 +4,7 @@ * * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) * @author Medúlio + * @author Oscar M. Lage */ $lang['encoding'] = 'utf-8'; $lang['direction'] = 'ltr'; @@ -45,6 +46,8 @@ $lang['btn_recover'] = 'Recuperar borrador'; $lang['btn_draftdel'] = 'Eliminar borrador'; $lang['btn_revert'] = 'Restaurar'; $lang['btn_register'] = 'Rexístrate'; +$lang['btn_apply'] = 'Aplicar'; +$lang['btn_media'] = 'Xestor de Arquivos-Media'; $lang['loggedinas'] = 'Iniciaches sesión como'; $lang['user'] = 'Nome de Usuario'; $lang['pass'] = 'Contrasinal'; @@ -89,25 +92,9 @@ $lang['txt_filename'] = 'Subir como (opcional)'; $lang['txt_overwrt'] = 'Sobrescribir arquivo existente'; $lang['lockedby'] = 'Bloqueado actualmente por'; $lang['lockexpire'] = 'O bloqueo remata o'; -$lang['js']['willexpire'] = 'O teu bloqueo para editares esta páxina vai caducar nun minuto.\nPara de evitar conflitos, emprega o botón de previsualización para reiniciares o contador do tempo de bloqueo.'; -$lang['js']['notsavedyet'] = "Perderanse os trocos non gardados.\nEstá certo de quereres continuar?"; -$lang['rssfailed'] = 'Houbo un erro ao tentar obter esta corrente RSS: '; -$lang['nothingfound'] = 'Non se atopou nada.'; -$lang['mediaselect'] = 'Arquivos-Media'; -$lang['fileupload'] = 'Subida de Arquivos-Media'; -$lang['uploadsucc'] = 'Subida correcta'; -$lang['uploadfail'] = 'Erra na subida. Pode que sexa un problema de permisos?'; -$lang['uploadwrong'] = 'Subida denegada. Esta extensión de arquivo non está permitida!'; -$lang['uploadexist'] = 'Xa existe o arquivo. Non se fixo nada.'; -$lang['uploadbadcontent'] = 'O contido subido non concorda coa extensión do arquivo %s.'; -$lang['uploadspam'] = 'A subida foi bloqueada pola lista negra de correo-lixo.'; -$lang['uploadxss'] = 'A subida foi bloqueada por un posíbel contido malicioso.'; -$lang['uploadsize'] = 'O arquivo subido é grande de máis. (máx. %s)'; -$lang['deletesucc'] = 'O arquivo "%s" foi eliminado.'; -$lang['deletefail'] = '"%s" non puido ser eliminado - comproba os permisos.'; -$lang['mediainuse'] = 'O arquivo "%s" non foi eliminado - aínda está en uso.'; -$lang['namespaces'] = 'Nomes de espazos'; -$lang['mediafiles'] = 'Arquivos dispoñíbeis en'; +$lang['js']['willexpire'] = 'O teu bloqueo para editares esta páxina vai caducar nun minuto.\nPara de evitar conflitos, emprega o botón de previsualización para reiniciares o contador do tempo de bloqueo.'; +$lang['js']['notsavedyet'] = 'Perderanse os trocos non gardados. +Está certo de quereres continuar?'; $lang['js']['searchmedia'] = 'Procurar ficheiros'; $lang['js']['keepopen'] = 'Manter a fiestra aberta na selección'; $lang['js']['hidedetails'] = 'Agochar Pormenores'; @@ -137,6 +124,35 @@ Sempre podes copiar e colar a ligazón.'; $lang['js']['linkwiz'] = 'Asistente de ligazóns'; $lang['js']['linkto'] = 'Ligazón para:'; $lang['js']['del_confirm'] = 'Estás certo de quereres eliminar os elementos seleccionados?'; +$lang['js']['restore_confirm'] = 'Realmente desexas restaurar esta versión?'; +$lang['js']['media_diff'] = 'Ver as diferencias:'; +$lang['js']['media_diff_both'] = 'Cara a Cara'; +$lang['js']['media_diff_opacity'] = 'Opacidade'; +$lang['js']['media_diff_portions'] = 'Porcións'; +$lang['js']['media_select'] = 'Selecciona arquivos...'; +$lang['js']['media_upload_btn'] = 'Subir'; +$lang['js']['media_done_btn'] = 'Feito'; +$lang['js']['media_drop'] = 'Solta aquí os arquivos a subir'; +$lang['js']['media_cancel'] = 'eliminar'; +$lang['js']['media_overwrt'] = 'Sobreescribir os arquivos existentes'; +$lang['rssfailed'] = 'Houbo un erro ao tentar obter esta corrente RSS: '; +$lang['nothingfound'] = 'Non se atopou nada.'; +$lang['mediaselect'] = 'Arquivos-Media'; +$lang['fileupload'] = 'Subida de Arquivos-Media'; +$lang['uploadsucc'] = 'Subida correcta'; +$lang['uploadfail'] = 'Erra na subida. Pode que sexa un problema de permisos?'; +$lang['uploadwrong'] = 'Subida denegada. Esta extensión de arquivo non está permitida!'; +$lang['uploadexist'] = 'Xa existe o arquivo. Non se fixo nada.'; +$lang['uploadbadcontent'] = 'O contido subido non concorda coa extensión do arquivo %s.'; +$lang['uploadspam'] = 'A subida foi bloqueada pola lista negra de correo-lixo.'; +$lang['uploadxss'] = 'A subida foi bloqueada por un posíbel contido malicioso.'; +$lang['uploadsize'] = 'O arquivo subido é grande de máis. (máx. %s)'; +$lang['deletesucc'] = 'O arquivo "%s" foi eliminado.'; +$lang['deletefail'] = '"%s" non puido ser eliminado - comproba os permisos.'; +$lang['mediainuse'] = 'O arquivo "%s" non foi eliminado - aínda está en uso.'; +$lang['namespaces'] = 'Nomes de espazos'; +$lang['mediafiles'] = 'Arquivos dispoñíbeis en'; +$lang['accessdenied'] = 'Non tes permitido ver esta páxina.'; $lang['mediausage'] = 'Emprega a seguinte sintaxe para inserires unha referencia a este arquivo:'; $lang['mediaview'] = 'Ver arquivo orixinal'; $lang['mediaroot'] = 'raigaña'; @@ -152,6 +168,10 @@ $lang['current'] = 'actual'; $lang['yours'] = 'A túa Versión'; $lang['diff'] = 'Amosar diferenzas coa versión actual'; $lang['diff2'] = 'Amosar diferenzas entre as revisións seleccionadas'; +$lang['difflink'] = 'Enlazar a esta vista de comparación'; +$lang['diff_type'] = 'Ver diferenzas:'; +$lang['diff_inline'] = 'Por liña'; +$lang['diff_side'] = 'Cara a Cara'; $lang['line'] = 'Liña'; $lang['breadcrumb'] = 'Trazado'; $lang['youarehere'] = 'Estás aquí'; @@ -169,6 +189,10 @@ $lang['mail_changed'] = 'páxina mudada:'; $lang['mail_subscribe_list'] = 'páxinas mudadas en nome de espazo:'; $lang['mail_new_user'] = 'Novo usuario:'; $lang['mail_upload'] = 'arquivo subido:'; +$lang['changes_type'] = 'Ver cambios'; +$lang['pages_changes'] = 'Páxinas'; +$lang['media_changes'] = 'Arquivos-Media'; +$lang['both_changes'] = 'Ambos, páxinas e arquivos-media'; $lang['qb_bold'] = 'Texto Resaltado'; $lang['qb_italic'] = 'Texto en Cursiva'; $lang['qb_underl'] = 'Texto Subliñado'; @@ -209,6 +233,9 @@ $lang['img_copyr'] = 'Copyright'; $lang['img_format'] = 'Formato'; $lang['img_camera'] = 'Cámara'; $lang['img_keywords'] = 'Verbas chave'; +$lang['img_width'] = 'Ancho'; +$lang['img_height'] = 'Alto'; +$lang['img_manager'] = 'Ver no xestor de arquivos-media'; $lang['subscr_subscribe_success'] = 'Engadido %s á lista de subscrición para %s'; $lang['subscr_subscribe_error'] = 'Erro ao tentar engadir %s á lista de subscrición para %s'; $lang['subscr_subscribe_noaddress'] = 'Non hai enderezos asociados co teu inicio de sesión, non é posíbel engadirte á lista de subscrición'; @@ -252,6 +279,7 @@ $lang['i_pol0'] = 'Wiki Aberto (lectura, escritura, subida de arq $lang['i_pol1'] = 'Wiki Público (lectura para todas as persoas, escritura e subida de arquivos para usuarios rexistrados)'; $lang['i_pol2'] = 'Wiki Fechado (lectura, escritura, subida de arquivos só para usuarios rexistrados)'; $lang['i_retry'] = 'Tentar de novo'; +$lang['i_license'] = 'Por favor escolla a licenza para o contido:'; $lang['mu_intro'] = 'Aquí podes subir varios arquivos de vez. Preme o botón Navegar para engadilos á cola. Preme en Subir cando remates.'; $lang['mu_gridname'] = 'Nome de Arquivo'; $lang['mu_gridsize'] = 'Tamaño'; @@ -275,3 +303,28 @@ $lang['days'] = 'hai %d días'; $lang['hours'] = 'hai %d horas'; $lang['minutes'] = 'hai %d minutos'; $lang['seconds'] = 'hai %d segundos'; +$lang['wordblock'] = 'Non se gardaron os cambios porque conteñen texto bloqueado (spam).'; +$lang['media_uploadtab'] = 'Subir'; +$lang['media_searchtab'] = 'Buscar'; +$lang['media_file'] = 'Arquivo'; +$lang['media_viewtab'] = 'Ver'; +$lang['media_edittab'] = 'Editar'; +$lang['media_historytab'] = 'Histórico'; +$lang['media_list_thumbs'] = 'Miniaturas'; +$lang['media_list_rows'] = 'Filas'; +$lang['media_sort_name'] = 'Nome'; +$lang['media_sort_date'] = 'Data'; +$lang['media_namespaces'] = 'Escolla espazo'; +$lang['media_files'] = 'Arquivos en %s'; +$lang['media_upload'] = 'Subir a %s'; +$lang['media_search'] = 'Buscar en %s'; +$lang['media_view'] = '%s'; +$lang['media_viewold'] = '%s en %s'; +$lang['media_edit'] = 'Editar %s'; +$lang['media_history'] = 'Historia de %s'; +$lang['media_meta_edited'] = 'datos meta editados'; +$lang['media_perm_read'] = 'Sentímolo, non tes permisos suficientes para ler arquivos.'; +$lang['media_perm_upload'] = 'Sentímolo, non tes permisos suficientes para subir arquivos.'; +$lang['media_update'] = 'Subir nova versión'; +$lang['media_restore'] = 'Restaurar esta versión'; +$lang['plugin_install_err'] = 'Extensión instalada correctamente. Re-nomea o directorio da extensión de \'%s\' a \'%s\'.'; diff --git a/lib/plugins/acl/lang/gl/lang.php b/lib/plugins/acl/lang/gl/lang.php index 774bf207a..db57598e6 100644 --- a/lib/plugins/acl/lang/gl/lang.php +++ b/lib/plugins/acl/lang/gl/lang.php @@ -3,6 +3,7 @@ * Galicianlanguage file * * @author Medúlio + * @author Oscar M. Lage */ $lang['admin_acl'] = 'Xestión da Lista de Control de Acceso (ACL)'; $lang['acl_group'] = 'Grupo'; diff --git a/lib/plugins/config/lang/gl/lang.php b/lib/plugins/config/lang/gl/lang.php index 07d62b7af..da40b44e6 100644 --- a/lib/plugins/config/lang/gl/lang.php +++ b/lib/plugins/config/lang/gl/lang.php @@ -3,6 +3,7 @@ * Galicianlanguage file * * @author Medúlio + * @author Oscar M. Lage */ $lang['menu'] = 'Opcións de Configuración'; $lang['error'] = 'Configuración non actualizada debido a un valor inválido, por favor revisa os teus trocos e volta envialos de novo. @@ -39,6 +40,7 @@ $lang['lang'] = 'Idioma'; $lang['basedir'] = 'Directorio base'; $lang['baseurl'] = 'URL base'; $lang['savedir'] = 'Directorio no que se gardarán os datos'; +$lang['cookiedir'] = 'Ruta das cookies. Deixar en blanco para usar a url de base.'; $lang['start'] = 'Nome da páxina inicial'; $lang['title'] = 'Título do Wiki'; $lang['template'] = 'Sobreplanta'; @@ -62,6 +64,7 @@ $lang['useheading'] = 'Utilizar a primeira cabeceira para os nomes de $lang['refcheck'] = 'Comprobar a referencia media'; $lang['refshow'] = 'Número de referencias media a amosar'; $lang['allowdebug'] = 'Permitir o depurado desactívao se non o precisas!'; +$lang['mediarevisions'] = 'Habilitar revisións dos arquivos-media?'; $lang['usewordblock'] = 'Bloquear correo-lixo segundo unha lista de verbas'; $lang['indexdelay'] = 'Retardo denantes de indexar (seg)'; $lang['relnofollow'] = 'Utilizar rel="nofollow" nas ligazóns externas'; @@ -92,6 +95,7 @@ $lang['useslash'] = 'Utilizar a barra inclinada (/) como separador $lang['usedraft'] = 'Gardar un borrador automaticamente no tempo da edición'; $lang['sepchar'] = 'Verba separadora do nome de páxina'; $lang['canonical'] = 'Utilizar URLs completamente canónicos'; +$lang['fnencode'] = 'Método para codificar os nomes de arquivo non-ASCII.'; $lang['autoplural'] = 'Comprobar formas plurais nas ligazóns'; $lang['compression'] = 'Método de compresión para arquivos attic'; $lang['cachetime'] = 'Tempo máximo para a caché (seg.)'; @@ -100,6 +104,7 @@ $lang['fetchsize'] = 'Tamaño máximo (en bytes) que pode descargar $lang['notify'] = 'Enviar notificacións de trocos a este enderezo de correo-e'; $lang['registernotify'] = 'Enviar información de novos usuarios rexistrados a este enderezo de correo-e'; $lang['mailfrom'] = 'Enderezo de correo-e a usar para as mensaxes automáticas'; +$lang['mailprefix'] = 'Prefixo de asunto de correo-e para as mensaxes automáticas'; $lang['gzip_output'] = 'Utilizar Contido-Codificación gzip para o xhtml'; $lang['gdlib'] = 'Versión da Libraría GD'; $lang['im_convert'] = 'Ruta deica a ferramenta de conversión ImageMagick'; @@ -132,6 +137,7 @@ $lang['proxy____port'] = 'Porto do Proxy'; $lang['proxy____user'] = 'Nome de usuario do Proxy'; $lang['proxy____pass'] = 'Contrasinal do Proxy'; $lang['proxy____ssl'] = 'Utilizar ssl para conectar ao Proxy'; +$lang['proxy____except'] = 'Expresión regular para atopar URLs que deban ser omitidas polo Proxy.'; $lang['safemodehack'] = 'Activar hack de modo seguro (safemode)'; $lang['ftp____host'] = 'Servidor FTP para o hack de modo seguro (safemode)'; $lang['ftp____port'] = 'Porto FTP para o hack de modo seguro(safemode)'; @@ -179,3 +185,4 @@ $lang['useheading_o_0'] = 'Endexamais'; $lang['useheading_o_navigation'] = 'Só Navegación'; $lang['useheading_o_content'] = 'Só Contido do Wiki'; $lang['useheading_o_1'] = 'Sempre'; +$lang['readdircache'] = 'Edad máxima para o directorio de caché (seg)'; diff --git a/lib/plugins/plugin/lang/gl/lang.php b/lib/plugins/plugin/lang/gl/lang.php index 157911a62..a314b71b9 100644 --- a/lib/plugins/plugin/lang/gl/lang.php +++ b/lib/plugins/plugin/lang/gl/lang.php @@ -3,6 +3,7 @@ * Galicianlanguage file * * @author Medúlio + * @author Oscar M. Lage */ $lang['menu'] = 'Xestionar Extensións'; $lang['download'] = 'Descargar e instalar unha nova extensión'; @@ -48,3 +49,4 @@ $lang['enabled'] = 'Extensión %s activado.'; $lang['notenabled'] = 'A extensión %s non puido ser activada, comproba os permisos de arquivo.'; $lang['disabled'] = 'Extensión %s desactivada.'; $lang['notdisabled'] = 'A extensión %s non puido ser desactivada, comproba os permisos de arquivo.'; +$lang['packageinstalled'] = 'Paquete de extensión (%d plugin(s): %s) instalado axeitadamente.'; diff --git a/lib/plugins/popularity/lang/gl/lang.php b/lib/plugins/popularity/lang/gl/lang.php index 3e7d9275b..34bd3935f 100644 --- a/lib/plugins/popularity/lang/gl/lang.php +++ b/lib/plugins/popularity/lang/gl/lang.php @@ -3,6 +3,12 @@ * Galician language file * * @author Medúlio + * @author Oscar M. Lage */ $lang['name'] = 'Resposta de Popularidade (pode demorar un tempo a cargar)'; $lang['submit'] = 'Enviar Datos'; +$lang['autosubmit'] = 'Enviar datos automáticamente unha vez por mes'; +$lang['submissionFailed'] = 'Os datos non se poden enviar debido ao seguinte erro:'; +$lang['submitDirectly'] = 'Podes enviar os datos de forma manual co seguinte formulario.'; +$lang['autosubmitError'] = 'O último envío automático fallou debido ao seguinte erro:'; +$lang['lastSent'] = 'Os datos foron enviados'; diff --git a/lib/plugins/popularity/lang/gl/submitted.txt b/lib/plugins/popularity/lang/gl/submitted.txt new file mode 100644 index 000000000..0dec55eef --- /dev/null +++ b/lib/plugins/popularity/lang/gl/submitted.txt @@ -0,0 +1,3 @@ +====== Resposta de Popularidade ====== + +Os datos foron enviados satisfactoriamente. \ No newline at end of file diff --git a/lib/plugins/revert/lang/gl/lang.php b/lib/plugins/revert/lang/gl/lang.php index 87bce32ba..a0c5a9785 100644 --- a/lib/plugins/revert/lang/gl/lang.php +++ b/lib/plugins/revert/lang/gl/lang.php @@ -3,6 +3,7 @@ * Galicianlanguage file * * @author Medúlio + * @author Oscar M. Lage */ $lang['menu'] = 'Xestor de Reversión'; $lang['filter'] = 'Procurar páxinas con correo-lixo'; diff --git a/lib/plugins/usermanager/lang/gl/lang.php b/lib/plugins/usermanager/lang/gl/lang.php index 0a01ef750..c9c633b39 100644 --- a/lib/plugins/usermanager/lang/gl/lang.php +++ b/lib/plugins/usermanager/lang/gl/lang.php @@ -3,6 +3,7 @@ * Galicianlanguage file * * @author Medúlio + * @author Oscar M. Lage */ $lang['menu'] = 'Xestor de Usuarios'; $lang['noauth'] = '(autenticación de usuarios non dispoñible)'; -- cgit v1.2.3 From 063fb5b5da7db55f0f8532aef9d5eda458d73b71 Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Mon, 9 Jan 2012 22:28:27 +0100 Subject: do not rely on tmpfile() in the AJAX uploader backend FS#2417 --- inc/media.php | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/inc/media.php b/inc/media.php index af4647ecb..508869b3b 100644 --- a/inc/media.php +++ b/inc/media.php @@ -230,16 +230,18 @@ function media_upload_xhr($ns,$auth){ $id = $_GET['qqfile']; list($ext,$mime,$dl) = mimetype($id); $input = fopen("php://input", "r"); - $temp = tmpfile(); - $realSize = stream_copy_to_stream($input, $temp); - fclose($input); - if ($realSize != (int)$_SERVER["CONTENT_LENGTH"]) return false; if (!($tmp = io_mktmpdir())) return false; $path = $tmp.'/'.md5($id); $target = fopen($path, "w"); - fseek($temp, 0, SEEK_SET); - stream_copy_to_stream($temp, $target); + $realSize = stream_copy_to_stream($input, $target); fclose($target); + fclose($input); + if ($realSize != (int)$_SERVER["CONTENT_LENGTH"]){ + unlink($target); + unlink($path); + return false; + } + $res = media_save( array('name' => $path, 'mime' => $mime, -- cgit v1.2.3 From 49b78edab36fc4af959fc17e489085e5790e61c5 Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Tue, 10 Jan 2012 10:44:28 +0100 Subject: make the installer check for new media dirs --- install.php | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/install.php b/install.php index 2f600c925..457902630 100644 --- a/install.php +++ b/install.php @@ -49,6 +49,7 @@ $dokuwiki_hash = array( '2010-11-07' => '7921d48195f4db21b8ead6d9bea801b8', '2011-05-25' => '4241865472edb6fa14a1227721008072', '2011-11-10' => 'b46ff19a7587966ac4df61cbab1b8b31', + 'devel' => '72c083c73608fc43c586901fd5dabb74', ); @@ -419,16 +420,18 @@ function check_permissions(){ global $lang; $dirs = array( - 'conf' => DOKU_LOCAL, - 'data' => DOKU_INC.'data', - 'pages' => DOKU_INC.'data/pages', - 'attic' => DOKU_INC.'data/attic', - 'media' => DOKU_INC.'data/media', - 'meta' => DOKU_INC.'data/meta', - 'cache' => DOKU_INC.'data/cache', - 'locks' => DOKU_INC.'data/locks', - 'index' => DOKU_INC.'data/index', - 'tmp' => DOKU_INC.'data/tmp' + 'conf' => DOKU_LOCAL, + 'data' => DOKU_INC.'data', + 'pages' => DOKU_INC.'data/pages', + 'attic' => DOKU_INC.'data/attic', + 'media' => DOKU_INC.'data/media', + 'media_attic' => DOKU_INC.'data/media_attic', + 'media_meta' => DOKU_INC.'data/media_meta', + 'meta' => DOKU_INC.'data/meta', + 'cache' => DOKU_INC.'data/cache', + 'locks' => DOKU_INC.'data/locks', + 'index' => DOKU_INC.'data/index', + 'tmp' => DOKU_INC.'data/tmp' ); $ok = true; -- cgit v1.2.3 From 2dba8df4d3a5c3e9d104bee5290766929f4cabee Mon Sep 17 00:00:00 2001 From: Adrian Lang Date: Fri, 13 Jan 2012 10:02:32 +0100 Subject: Fix sorting in media manager search (FS#2423) --- inc/media.php | 2 +- lib/scripts/media.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/inc/media.php b/inc/media.php index 508869b3b..29c3d0153 100644 --- a/inc/media.php +++ b/inc/media.php @@ -759,7 +759,7 @@ function media_tab_search($ns,$auth=null) { echo '
'.NL; media_searchform($ns, $query, true); - if ($do == 'searchlist') { + if ($do == 'searchlist' || $query) { media_searchlist($query,$ns,$auth,true,_media_get_sort_type()); } echo '
'.NL; diff --git a/lib/scripts/media.js b/lib/scripts/media.js index c74633523..841baa93f 100644 --- a/lib/scripts/media.js +++ b/lib/scripts/media.js @@ -135,7 +135,7 @@ var dw_mediamanager = { }); $sortBy.children('input').change(function (event) { dw_mediamanager.set_fileview_sort(); - dw_mediamanager.list.call(this, event); + dw_mediamanager.list.call(jQuery('#dw__mediasearch')[0] || this, event); }); }, -- cgit v1.2.3 From 02eb484f1af2dd64a078b53cb5bcfe2a832022ec Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Thu, 12 Jan 2012 17:28:22 +0100 Subject: always show full filename as tooltip in mediamanager --- inc/media.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/inc/media.php b/inc/media.php index 29c3d0153..8ff0a7d14 100644 --- a/inc/media.php +++ b/inc/media.php @@ -1352,7 +1352,7 @@ function media_printfile($item,$auth,$jump,$display_namespace=false){ $info .= filesize_h($item['size']); // output - echo '
'.NL; + echo '
'.NL; if (!$display_namespace) { echo ''.hsc($file).' '; } else { @@ -1413,7 +1413,7 @@ function media_printfile_thumbs($item,$auth,$jump=false,$display_namespace=false $file = utf8_decodeFN($item['file']); // output - echo '
  • '.NL; + echo '
  • '.NL; echo '
    '; if($item['isimg']) { -- cgit v1.2.3 From b8a84c03383cce9c6b85f9d742ae06fac02dd6cd Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Thu, 12 Jan 2012 18:34:48 +0100 Subject: readded missing "view original" button to the new media manager Template authors need to update their _mediamanager.css --- inc/template.php | 12 +++++++++++- lib/tpl/default/_mediamanager.css | 10 ++++++++++ 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/inc/template.php b/inc/template.php index 476ef74a3..9d1609fd3 100644 --- a/inc/template.php +++ b/inc/template.php @@ -1202,7 +1202,16 @@ function tpl_mediaFileDetails($image, $rev){ media_tabs_details($image, $opened_tab); - echo '

    '; + echo '
    '; + + // view button + if($opened_tab === 'view'){ + $link = ml($image,array('rev'=>$rev),true); + echo ' '; + } + + echo '

    '; list($ext,$mime,$dl) = mimetype($image,false); $class = preg_replace('/[^_\-a-z0-9]+/i','_',$ext); $class = 'select mediafile mf_'.$class; @@ -1212,6 +1221,7 @@ function tpl_mediaFileDetails($image, $rev){ } else { printf($lang['media_' . $opened_tab], $tabTitle); } + echo '

    '.NL; echo '
    '.NL; diff --git a/lib/tpl/default/_mediamanager.css b/lib/tpl/default/_mediamanager.css index 198c7f440..9b1ece8d7 100644 --- a/lib/tpl/default/_mediamanager.css +++ b/lib/tpl/default/_mediamanager.css @@ -59,6 +59,7 @@ background-color: __background_alt__; } + /*____________ Namespaces tree ____________*/ #mediamanager__page .namespaces h2 { @@ -101,6 +102,15 @@ margin: 0 0 3px; } +#mediamanager__page .file .panelHeader h3 { + margin-right: 18px; +} + +#mediamanager__page .file .panelHeader img.btn { + float: right; + width: 16px; +} + #mediamanager__page .panelHeader form.options { float: right; margin-top: -3px; -- cgit v1.2.3 From d5a60123788a782751806b76bcba14270951a9e3 Mon Sep 17 00:00:00 2001 From: Begina Felicysym Date: Fri, 13 Jan 2012 10:09:44 +0100 Subject: Polish language update --- inc/lang/pl/lang.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/inc/lang/pl/lang.php b/inc/lang/pl/lang.php index 98536033c..37d842c44 100644 --- a/inc/lang/pl/lang.php +++ b/inc/lang/pl/lang.php @@ -135,6 +135,8 @@ $lang['js']['del_confirm'] = 'Czy na pewno usunąć?'; $lang['js']['restore_confirm'] = 'Naprawdę przywrócić tą wersję?'; $lang['js']['media_diff'] = 'Pokaż różnice:'; $lang['js']['media_diff_both'] = 'Obok siebie'; +$lang['js']['media_diff_opacity'] = 'Przezroczystość'; +$lang['js']['media_diff_portions'] = 'Przesunięcie'; $lang['js']['media_select'] = 'Wybierz pliki...'; $lang['js']['media_upload_btn'] = 'Przesłanie plików'; $lang['js']['media_done_btn'] = 'Zrobione'; -- cgit v1.2.3 From 23735ba4c5021df9ab8c1b4a0e8322cebdaf5931 Mon Sep 17 00:00:00 2001 From: lupo49 Date: Fri, 13 Jan 2012 20:07:29 +0100 Subject: localization: removed strings from old flashuploader --- inc/lang/af/lang.php | 2 -- inc/lang/ar/lang.php | 15 --------------- inc/lang/az/lang.php | 15 --------------- inc/lang/bg/lang.php | 16 ---------------- inc/lang/ca-valencia/lang.php | 15 --------------- inc/lang/ca/lang.php | 15 --------------- inc/lang/cs/lang.php | 15 --------------- inc/lang/da/lang.php | 15 --------------- inc/lang/de-informal/lang.php | 15 --------------- inc/lang/de/lang.php | 15 --------------- inc/lang/el/lang.php | 15 --------------- inc/lang/en/lang.php | 16 ---------------- inc/lang/eo/lang.php | 15 --------------- inc/lang/es/lang.php | 15 --------------- inc/lang/et/lang.php | 9 --------- inc/lang/eu/lang.php | 15 --------------- inc/lang/fa/lang.php | 15 --------------- inc/lang/fi/lang.php | 15 --------------- inc/lang/fr/lang.php | 15 --------------- inc/lang/gl/lang.php | 15 --------------- inc/lang/he/lang.php | 15 --------------- inc/lang/hi/lang.php | 7 ------- inc/lang/hr/lang.php | 15 --------------- inc/lang/hu/lang.php | 15 --------------- inc/lang/ia/lang.php | 15 --------------- inc/lang/id/lang.php | 11 ----------- inc/lang/is/lang.php | 7 ------- inc/lang/it/lang.php | 15 --------------- inc/lang/ja/lang.php | 15 --------------- inc/lang/ko/lang.php | 15 --------------- inc/lang/la/lang.php | 15 --------------- inc/lang/lb/lang.php | 15 --------------- inc/lang/lt/lang.php | 11 ----------- inc/lang/lv/lang.php | 15 --------------- inc/lang/mk/lang.php | 14 -------------- inc/lang/mr/lang.php | 13 ------------- inc/lang/ne/lang.php | 13 ------------- inc/lang/nl/lang.php | 15 --------------- inc/lang/no/lang.php | 15 --------------- inc/lang/pl/lang.php | 15 --------------- inc/lang/pt-br/lang.php | 15 --------------- inc/lang/pt/lang.php | 15 --------------- inc/lang/ro/lang.php | 15 --------------- inc/lang/ru/lang.php | 16 ---------------- inc/lang/sk/lang.php | 15 --------------- inc/lang/sl/lang.php | 15 --------------- inc/lang/sq/lang.php | 15 --------------- inc/lang/sr/lang.php | 15 --------------- inc/lang/sv/lang.php | 15 --------------- inc/lang/th/lang.php | 15 --------------- inc/lang/tr/lang.php | 13 ------------- inc/lang/uk/lang.php | 15 --------------- inc/lang/zh-tw/lang.php | 15 --------------- inc/lang/zh/lang.php | 16 +--------------- 54 files changed, 1 insertion(+), 763 deletions(-) diff --git a/inc/lang/af/lang.php b/inc/lang/af/lang.php index 6665196f4..16e9a2822 100644 --- a/inc/lang/af/lang.php +++ b/inc/lang/af/lang.php @@ -71,5 +71,3 @@ $lang['img_date'] = 'Datem'; $lang['img_camera'] = 'Camera'; $lang['i_wikiname'] = 'Wiki Naam'; $lang['i_funcna'] = 'PHP funksie %s is nie beskibaar nie. Miskien is dit af gehaal.'; -$lang['mu_toobig'] = 'te groet'; -$lang['mu_done'] = 'klaar'; diff --git a/inc/lang/ar/lang.php b/inc/lang/ar/lang.php index 02a62fe94..11c111505 100644 --- a/inc/lang/ar/lang.php +++ b/inc/lang/ar/lang.php @@ -266,21 +266,6 @@ $lang['i_pol1'] = 'ويكي عامة؛ أي القراءة للج $lang['i_pol2'] = 'ويكي مغلقة؛ أي القراءة والكتابة والتحميل للمشتركين المسجلين فقط'; $lang['i_retry'] = 'إعادة المحاولة'; $lang['i_license'] = 'اختر الرخصة التي تريد وضع المحتوى تحتها:'; -$lang['mu_intro'] = 'هنا يمكنك رفع ملفات متعددة في وقت واحد. انقر على زر استعرض لاضافتهم إلى الطابور. انقر ارفع عند الانتهاء.'; -$lang['mu_gridname'] = 'اسم الملف'; -$lang['mu_gridsize'] = 'الحجم'; -$lang['mu_gridstat'] = 'الحالة'; -$lang['mu_namespace'] = 'نطاق'; -$lang['mu_browse'] = 'استعرض'; -$lang['mu_toobig'] = 'كبير جدا'; -$lang['mu_ready'] = 'جاهز للرفع'; -$lang['mu_done'] = 'اكتمل'; -$lang['mu_fail'] = 'فشل'; -$lang['mu_authfail'] = 'انتهت الجلسة'; -$lang['mu_progress'] = 'رُفع @PCT@% '; -$lang['mu_filetypes'] = 'انواع الملفات المسموحة'; -$lang['mu_info'] = 'تم رفع الملفات'; -$lang['mu_lasterr'] = 'آخر خطأ:'; $lang['recent_global'] = 'انت تراقب حاليا التغييرات داخل نطاق %s. يمكنك أيضا عرض أحدث تغييرات الويكي كلها.'; $lang['years'] = '%d سنة مضت'; $lang['months'] = '%d شهرا مضى'; diff --git a/inc/lang/az/lang.php b/inc/lang/az/lang.php index 13ba7b3c3..25b44efdc 100644 --- a/inc/lang/az/lang.php +++ b/inc/lang/az/lang.php @@ -217,21 +217,6 @@ $lang['i_pol0'] = 'Tam açıq wiki (oxumaq, yazmaq, fayl yükləm $lang['i_pol1'] = 'Acıq wiki (oxumaq hamıya olar, yazmaq və fayl yükləmək ancaq üzv olan istifadəçilərə olar)'; $lang['i_pol2'] = 'Bağlı wiki (uxumaq, yazmaq və yükləmək ancaq üzv olan istifadəçilərə olar)'; $lang['i_retry'] = 'Cəhdi təkrarla'; -$lang['mu_intro'] = 'Burda siz bir neçə faylı birdən yükləyə bilərsiniz. Fayl əlavə etmək üçün "fayl seç" düyməsini sıxın. Sonda "yüklə" düyməsini sıxın.'; -$lang['mu_gridname'] = 'Faylın adı'; -$lang['mu_gridsize'] = 'Həcmi'; -$lang['mu_gridstat'] = 'Status'; -$lang['mu_namespace'] = 'Namespace'; -$lang['mu_browse'] = 'Fayl seç'; -$lang['mu_toobig'] = 'çox böyükdür'; -$lang['mu_ready'] = 'yükləməyə hazırdı'; -$lang['mu_done'] = 'başa çatdı'; -$lang['mu_fail'] = 'xəta baş verdi'; -$lang['mu_authfail'] = 'sessiyanın vaxtı bitdi'; -$lang['mu_progress'] = '@PCT@% yükləndi'; -$lang['mu_filetypes'] = 'İçazə olan fayl növləri'; -$lang['mu_info'] = 'fayllar yükləndi.'; -$lang['mu_lasterr'] = 'Son xəta:'; $lang['recent_global'] = '%s namespace-də baş vermiş dəyışıklərə baxırsınız. Siz həmçinin wiki-də bu yaxında baş vermiş bütün dəyişiklərə baxa bilərsiniz.'; $lang['years'] = '%d il əvvəl'; $lang['months'] = '%d ay əvvəl'; diff --git a/inc/lang/bg/lang.php b/inc/lang/bg/lang.php index 1c6c90703..b21fed9af 100644 --- a/inc/lang/bg/lang.php +++ b/inc/lang/bg/lang.php @@ -276,22 +276,6 @@ $lang['i_pol1'] = 'Публично Wiki (всеки може д $lang['i_pol2'] = 'Затворено Wiki (само регистрирани четат, пишат и качват)'; $lang['i_retry'] = 'Повторен опит'; $lang['i_license'] = 'Моля, изберете лиценз под който желаете да публикувате съдържанието:'; -$lang['mu_intro'] = 'От тук можете да качите няколко файла наведнъж. Натиснете бутона "Избиране", изберете файлове и натиснете "Качване". -'; -$lang['mu_gridname'] = 'Име на файла'; -$lang['mu_gridsize'] = 'Големина'; -$lang['mu_gridstat'] = 'Състояние'; -$lang['mu_namespace'] = 'Именно пространство'; -$lang['mu_browse'] = 'Избиране'; -$lang['mu_toobig'] = 'прекалено голям'; -$lang['mu_ready'] = 'готов за качване'; -$lang['mu_done'] = 'качен'; -$lang['mu_fail'] = 'неуспешно качване'; -$lang['mu_authfail'] = 'приключила сесия'; -$lang['mu_progress'] = '@PCT@% качен'; -$lang['mu_filetypes'] = 'Позволени файлови разширения'; -$lang['mu_info'] = 'качени файла.'; -$lang['mu_lasterr'] = 'Последна грешка:'; $lang['recent_global'] = 'В момента преглеждате промените в именно пространство %s. Може да прегледате и промените в цялото Wiki.'; $lang['years'] = 'преди %d години'; $lang['months'] = 'преди %d месеца'; diff --git a/inc/lang/ca-valencia/lang.php b/inc/lang/ca-valencia/lang.php index eac9fc8d1..6317197ed 100644 --- a/inc/lang/ca-valencia/lang.php +++ b/inc/lang/ca-valencia/lang.php @@ -221,21 +221,6 @@ $lang['i_pol0'] = 'Wiki obert (llegir, escriure i enviar tots)'; $lang['i_pol1'] = 'Wiki públic (llegir tots, escriure i enviar només usuaris registrats)'; $lang['i_pol2'] = 'Wiki tancat (llegir, escriure i enviar només usuaris registrats)'; $lang['i_retry'] = 'Reintentar'; -$lang['mu_intro'] = 'Des d\'ací pot enviar diversos archius d\'una volta. Pulse el botó d\'examinar per a afegir-los a la coa. Pulse enviar quan ho tinga.'; -$lang['mu_gridname'] = 'Nom d\'archiu'; -$lang['mu_gridsize'] = 'Tamany'; -$lang['mu_gridstat'] = 'Estat'; -$lang['mu_namespace'] = 'Espai de noms'; -$lang['mu_browse'] = 'Examinar'; -$lang['mu_toobig'] = 'massa gran'; -$lang['mu_ready'] = 'preparat per a enviar'; -$lang['mu_done'] = 'complet'; -$lang['mu_fail'] = 'fallit'; -$lang['mu_authfail'] = 'la sessió ha vençut'; -$lang['mu_progress'] = '@PCT@% enviat'; -$lang['mu_filetypes'] = 'Classes d\'archiu permeses'; -$lang['mu_info'] = 'archius enviats.'; -$lang['mu_lasterr'] = 'Últim erro:'; $lang['recent_global'] = 'Està veent els canvis dins de l\'espai de noms %s. També pot vore els canvis recents en el wiki sancer.'; $lang['years'] = 'fa %d anys'; $lang['months'] = 'fa %d mesos'; diff --git a/inc/lang/ca/lang.php b/inc/lang/ca/lang.php index 7094df5b4..81ef2c7fe 100644 --- a/inc/lang/ca/lang.php +++ b/inc/lang/ca/lang.php @@ -217,21 +217,6 @@ $lang['i_pol0'] = 'Wiki obert (tothom pot llegir, escriure i penj $lang['i_pol1'] = 'Wiki públic (tothom pot llegir, els usuaris registrats poden escriure i penjar fitxers)'; $lang['i_pol2'] = 'Wiki tancat (només els usuaris registrats poden llegir, escriure i penjar fitxers)'; $lang['i_retry'] = 'Reintenta'; -$lang['mu_intro'] = 'Aquí podeu penjar múltiples fitxers d\'una vegada. Feu clic en el botó Explora per afegir els fitxers a la cua. Després, premeu Penja.'; -$lang['mu_gridname'] = 'Nom del fitxer'; -$lang['mu_gridsize'] = 'Mida'; -$lang['mu_gridstat'] = 'Estat'; -$lang['mu_namespace'] = 'Espai'; -$lang['mu_browse'] = 'Explora'; -$lang['mu_toobig'] = 'massa gran'; -$lang['mu_ready'] = 'llest per a penjar'; -$lang['mu_done'] = 'complet'; -$lang['mu_fail'] = 'error'; -$lang['mu_authfail'] = 'la sessió ha vençut'; -$lang['mu_progress'] = 'càrrega @PCT@%'; -$lang['mu_filetypes'] = 'Tipus de fitxer permesos'; -$lang['mu_info'] = 'fitxers penjats.'; -$lang['mu_lasterr'] = 'Darrer error:'; $lang['recent_global'] = 'Esteu veient els canvis recents de l\'espai %s. També podeu veure els canvis recents de tot el wiki.'; $lang['years'] = 'fa %d anys'; $lang['months'] = 'fa %d mesos'; diff --git a/inc/lang/cs/lang.php b/inc/lang/cs/lang.php index c6eb7be49..badd57ac5 100644 --- a/inc/lang/cs/lang.php +++ b/inc/lang/cs/lang.php @@ -282,21 +282,6 @@ $lang['i_pol1'] = 'Veřejná wiki (čtení pro všechny, zápis a $lang['i_pol2'] = 'Uzavřená wiki (čtení, zápis a upload pouze pro registrované uživatele)'; $lang['i_retry'] = 'Zkusit znovu'; $lang['i_license'] = 'Vyberte prosím licenci obsahu:'; -$lang['mu_intro'] = 'Zde můžete načíst více souborů najednou. Pro přidání souborů do fronty stiskněte tlačítko "Procházet". Až budete hotovi, stiskněte "Načíst".'; -$lang['mu_gridname'] = 'Název souboru'; -$lang['mu_gridsize'] = 'Velikost'; -$lang['mu_gridstat'] = 'Stav'; -$lang['mu_namespace'] = 'Jmenný prostor'; -$lang['mu_browse'] = 'Procházet'; -$lang['mu_toobig'] = 'příliš velké'; -$lang['mu_ready'] = 'připraveno k načtení'; -$lang['mu_done'] = 'hotovo'; -$lang['mu_fail'] = 'selhalo'; -$lang['mu_authfail'] = 'vypršela session'; -$lang['mu_progress'] = '@PCT@% načten'; -$lang['mu_filetypes'] = 'Povolené typy souborů'; -$lang['mu_info'] = 'soubory načteny.'; -$lang['mu_lasterr'] = 'Poslední chyba:'; $lang['recent_global'] = 'Právě si prohlížíte změny ve jmenném prostoru %s. Také si můžete zobrazit změny v celé wiki.'; $lang['years'] = 'před %d roky'; $lang['months'] = 'před %d měsíci'; diff --git a/inc/lang/da/lang.php b/inc/lang/da/lang.php index 0b6961921..e8a4e3fe9 100644 --- a/inc/lang/da/lang.php +++ b/inc/lang/da/lang.php @@ -262,21 +262,6 @@ $lang['i_pol1'] = 'Offentlig Wiki (alle kan læse, kun registrere $lang['i_pol2'] = 'Lukket Wiki (kun for registerede brugere kan læse, skrive og overføre)'; $lang['i_retry'] = 'Forsøg igen'; $lang['i_license'] = 'Vælg venligst licensen du vil tilføje dit indhold under:'; -$lang['mu_intro'] = 'Her kan du overføre flere filer af gangen. Klik på gennemse for at tilføje dem til køen. Tryk på overføre knappen når du er klar.'; -$lang['mu_gridname'] = 'Filnavn'; -$lang['mu_gridsize'] = 'Størrelse'; -$lang['mu_gridstat'] = 'Status'; -$lang['mu_namespace'] = 'Navnerum'; -$lang['mu_browse'] = 'gennemse'; -$lang['mu_toobig'] = 'for stor'; -$lang['mu_ready'] = 'klar til overføre'; -$lang['mu_done'] = 'færdig'; -$lang['mu_fail'] = 'fejlede'; -$lang['mu_authfail'] = 'session udløb'; -$lang['mu_progress'] = '@PCT@% upload'; -$lang['mu_filetypes'] = 'Tilladte filtyper'; -$lang['mu_info'] = 'filer var overføret.'; -$lang['mu_lasterr'] = 'Sidste fejl:'; $lang['recent_global'] = 'Du ser lige nu ændringerne i %s navnerummet. Du kan også se de sidste ændringer for hele wiki siden '; $lang['years'] = '%d år siden'; $lang['months'] = '%d måned siden'; diff --git a/inc/lang/de-informal/lang.php b/inc/lang/de-informal/lang.php index 3779d6fb3..56751629c 100644 --- a/inc/lang/de-informal/lang.php +++ b/inc/lang/de-informal/lang.php @@ -288,21 +288,6 @@ $lang['i_pol1'] = 'Öffentliches Wiki (lesen für alle, schreiben $lang['i_pol2'] = 'Geschlossenes Wiki (lesen, schreiben, hochladen nur für registrierte Nutzer)'; $lang['i_retry'] = 'Wiederholen'; $lang['i_license'] = 'Bitte wähle die Lizenz aus unter der die Wiki-Inhalte veröffentlicht werden sollen:'; -$lang['mu_intro'] = 'In diesem Bereich kannst du mehrere Dateien gleichzeitig hochladen. Benutze die Schaltfläche "Durchsuchen", um sie der Warteschlange zuzufügen. Betätige die Schaltfläche "Hochladen", um die Übertragung zu starten.'; -$lang['mu_gridname'] = 'Dateiname'; -$lang['mu_gridsize'] = 'Größe'; -$lang['mu_gridstat'] = 'Status'; -$lang['mu_namespace'] = 'Namensraum'; -$lang['mu_browse'] = 'Durchsuchen'; -$lang['mu_toobig'] = 'zu groß'; -$lang['mu_ready'] = 'bereit zum Hochladen'; -$lang['mu_done'] = 'fertig'; -$lang['mu_fail'] = 'gescheitert'; -$lang['mu_authfail'] = 'Sitzung abgelaufen'; -$lang['mu_progress'] = '@PCT@% hochgeladen'; -$lang['mu_filetypes'] = 'Erlaubte Dateitypen'; -$lang['mu_info'] = 'Dateien hochgeladen.'; -$lang['mu_lasterr'] = 'Letzter Fehler:'; $lang['recent_global'] = 'Im Moment siehst du die Änderungen im Namensraum %s. Du kannst auch die Änderungen im gesamten Wiki sehen.'; $lang['years'] = 'vor %d Jahren'; $lang['months'] = 'vor %d Monaten'; diff --git a/inc/lang/de/lang.php b/inc/lang/de/lang.php index 3bd326c84..4e7e6abbb 100644 --- a/inc/lang/de/lang.php +++ b/inc/lang/de/lang.php @@ -290,21 +290,6 @@ $lang['i_pol1'] = 'Öffentliches Wiki (lesen für alle, schreiben $lang['i_pol2'] = 'Geschlossenes Wiki (lesen, schreiben, hochladen nur für registrierte Nutzer)'; $lang['i_retry'] = 'Wiederholen'; $lang['i_license'] = 'Bitte wählen Sie die Lizenz, unter die Sie Ihre Inhalte stellen möchten:'; -$lang['mu_intro'] = 'In diesem Bereich können Sie mehrere Dateien gleichzeitig hochladen. Benutzen Sie die Schaltfläche "Durchsuchen" um sie der Warteschlange zuzufügen. Betätigen Sie die Schaltfläche "Hochladen" um die Übertragung zu starten.'; -$lang['mu_gridname'] = 'Dateiname'; -$lang['mu_gridsize'] = 'Größe'; -$lang['mu_gridstat'] = 'Status'; -$lang['mu_namespace'] = 'Namensraum'; -$lang['mu_browse'] = 'Durchsuchen'; -$lang['mu_toobig'] = 'zu groß'; -$lang['mu_ready'] = 'bereit zum Hochladen'; -$lang['mu_done'] = 'fertig'; -$lang['mu_fail'] = 'gescheitert'; -$lang['mu_authfail'] = 'Sitzung abgelaufen'; -$lang['mu_progress'] = '@PCT@% hochgeladen'; -$lang['mu_filetypes'] = 'Erlaubte Dateitypen'; -$lang['mu_info'] = 'Dateien hochgeladen!'; -$lang['mu_lasterr'] = 'Letzter Fehler:'; $lang['recent_global'] = 'Im Moment sehen Sie die Änderungen im Namensraum %s. Sie können auch die Änderungen im gesamten Wiki sehen.'; $lang['years'] = 'vor %d Jahren'; $lang['months'] = 'vor %d Monaten'; diff --git a/inc/lang/el/lang.php b/inc/lang/el/lang.php index 4c334c1de..34a7d36e8 100644 --- a/inc/lang/el/lang.php +++ b/inc/lang/el/lang.php @@ -280,21 +280,6 @@ $lang['i_pol1'] = 'Δημόσιο Wiki (όλοι μπορούν $lang['i_pol2'] = 'Κλειστό Wiki (μόνο οι εγγεγραμμένοι χρήστες μπορούν να διαβάσουν ή να δημιουργήσουν/τροποποιήσουν σελίδες και να μεταφορτώσουν αρχεία)'; $lang['i_retry'] = 'Νέα προσπάθεια'; $lang['i_license'] = 'Παρακαλώ επιλέξτε την άδεια που θα χρησιμοποιήσετε για την διάθεση του περιεχομένου σας:'; -$lang['mu_intro'] = 'Εδώ μπορείτε να φορτώσετε ταυτόχρονα πολλαπλά αρχεία. Πατήστε στο κουμπί προεπισκόπησης για να τα προσθέσετε στη λίστα. Πατήστε στο κουμπί μεταφόρτωσης όταν έχετε τελειώσει.'; -$lang['mu_gridname'] = 'Όνομα αρχείου'; -$lang['mu_gridsize'] = 'Μέγεθος'; -$lang['mu_gridstat'] = 'Κατάσταση'; -$lang['mu_namespace'] = 'Φάκελος'; -$lang['mu_browse'] = 'Επισκόπηση'; -$lang['mu_toobig'] = 'υπερβολικά μεγάλο'; -$lang['mu_ready'] = 'έτοιμο για φόρτωση'; -$lang['mu_done'] = 'ολοκληρώθηκε'; -$lang['mu_fail'] = 'απέτυχε'; -$lang['mu_authfail'] = 'η συνεδρία έληξε'; -$lang['mu_progress'] = 'φορτώθηκε @PCT@%'; -$lang['mu_filetypes'] = 'Επιτρεπτοί τύποι αρχείων'; -$lang['mu_info'] = 'τα αρχεία ανέβηκαν.'; -$lang['mu_lasterr'] = 'Τελευταίο σφάλμα:'; $lang['recent_global'] = 'Βλέπετε τις αλλαγές εντός του φακέλου %s. Μπορείτε επίσης να δείτε τις πρόσφατες αλλαγές σε όλο το wiki.'; $lang['years'] = 'πριν %d χρόνια'; $lang['months'] = 'πριν %d μήνες'; diff --git a/inc/lang/en/lang.php b/inc/lang/en/lang.php index 89a7c4d40..1bfff2897 100644 --- a/inc/lang/en/lang.php +++ b/inc/lang/en/lang.php @@ -304,22 +304,6 @@ $lang['i_pol2'] = 'Closed Wiki (read, write, upload for registere $lang['i_retry'] = 'Retry'; $lang['i_license'] = 'Please choose the license you want to put your content under:'; -$lang['mu_intro'] = 'Here you can upload multiple files at once. Click the browse button to add them to the queue. Press upload when done.'; -$lang['mu_gridname'] = 'Filename'; -$lang['mu_gridsize'] = 'Size'; -$lang['mu_gridstat'] = 'Status'; -$lang['mu_namespace'] = 'Namespace'; -$lang['mu_browse'] = 'Browse'; -$lang['mu_toobig'] = 'too big'; -$lang['mu_ready'] = 'ready for upload'; -$lang['mu_done'] = 'complete'; -$lang['mu_fail'] = 'failed'; -$lang['mu_authfail'] = 'session expired'; -$lang['mu_progress'] = '@PCT@% uploaded'; -$lang['mu_filetypes'] = 'Allowed Filetypes'; -$lang['mu_info'] = 'files uploaded.'; -$lang['mu_lasterr'] = 'Last error:'; - $lang['recent_global'] = 'You\'re currently watching the changes inside the %s namespace. You can also view the recent changes of the whole wiki.'; $lang['years'] = '%d years ago'; $lang['months'] = '%d months ago'; diff --git a/inc/lang/eo/lang.php b/inc/lang/eo/lang.php index 01772726f..c8148c772 100644 --- a/inc/lang/eo/lang.php +++ b/inc/lang/eo/lang.php @@ -281,21 +281,6 @@ $lang['i_pol1'] = 'Publika Vikio (legi povas ĉiuj, skribi kaj al $lang['i_pol2'] = 'Ferma Vikio (legi, skribi, alŝuti nur povas registritaj uzantoj)'; $lang['i_retry'] = 'Reprovi'; $lang['i_license'] = 'Bonvolu elekti la permesilon, sub kiun vi volas meti vian enhavon:'; -$lang['mu_intro'] = 'Ĉi tie vi povas alŝuti plurajn dosierojn multope. Klaku la esplor-butonon por aldoni ilin al la vico. Premu alŝuti kiam prete.'; -$lang['mu_gridname'] = 'Dosiernomo'; -$lang['mu_gridsize'] = 'Grandeco'; -$lang['mu_gridstat'] = 'Stato'; -$lang['mu_namespace'] = 'Nomspaco'; -$lang['mu_browse'] = 'Esplori'; -$lang['mu_toobig'] = 'tro granda'; -$lang['mu_ready'] = 'preta por alŝuti'; -$lang['mu_done'] = 'plenumite'; -$lang['mu_fail'] = 'malsukcesinte'; -$lang['mu_authfail'] = 'sekcio tro longdaŭris'; -$lang['mu_progress'] = '@PCT@% alŝutite'; -$lang['mu_filetypes'] = 'Permesitaj dosiertipoj'; -$lang['mu_info'] = 'alŝutitaj dosieroj.'; -$lang['mu_lasterr'] = 'Lasta eraro:'; $lang['recent_global'] = 'Vi nun rigardas la ŝanĝojn ene de la nomspaco %s. Vi povas ankaŭ vidi la freŝajn ŝanĝojn de la tuta vikio.'; $lang['years'] = 'antaŭ %d jaroj'; $lang['months'] = 'antaŭ %d monatoj'; diff --git a/inc/lang/es/lang.php b/inc/lang/es/lang.php index 7d365bfbe..28ff17a16 100644 --- a/inc/lang/es/lang.php +++ b/inc/lang/es/lang.php @@ -297,21 +297,6 @@ $lang['i_pol1'] = 'Wiki público (leer para todos, escribir y sub $lang['i_pol2'] = 'Wiki cerrado (leer, escribir y subir archivos para usuarios registrados únicamente)'; $lang['i_retry'] = 'Reintentar'; $lang['i_license'] = 'Por favor escoja una licencia bajo la que publicar su contenido:'; -$lang['mu_intro'] = 'Puedes subir varios archivos a la vez desde aquí. Pulsa el botón del navegador para agregarlos a la cola. Pulsa "subir archivo" para proceder.'; -$lang['mu_gridname'] = 'Nombre de archivo'; -$lang['mu_gridsize'] = 'Tamaño'; -$lang['mu_gridstat'] = 'Estado'; -$lang['mu_namespace'] = 'Espacio de nombres'; -$lang['mu_browse'] = 'Buscar'; -$lang['mu_toobig'] = 'demasiado grande'; -$lang['mu_ready'] = 'listo para subir'; -$lang['mu_done'] = 'completado'; -$lang['mu_fail'] = 'falló'; -$lang['mu_authfail'] = 'la sesión caducó'; -$lang['mu_progress'] = '@PCT@% transferido'; -$lang['mu_filetypes'] = 'Tipos de archivos permitidos'; -$lang['mu_info'] = 'Archivos subidos:'; -$lang['mu_lasterr'] = 'Último error:'; $lang['recent_global'] = 'Actualmente estás viendo los cambios dentro del namespace %s. También puedes ver los cambios recientes en el wiki completo.'; $lang['years'] = '%d años atrás'; $lang['months'] = '%d meses atrás'; diff --git a/inc/lang/et/lang.php b/inc/lang/et/lang.php index 6cd2f437d..5d882f165 100644 --- a/inc/lang/et/lang.php +++ b/inc/lang/et/lang.php @@ -232,12 +232,3 @@ $lang['i_pol0'] = 'Avatud (lugemine, kirjutamine ja üleslaadimin $lang['i_pol1'] = 'Avalikuks lugemiseks (lugeda saavad kõik, kirjutada ja üles laadida vaid registreeritud kasutajad)'; $lang['i_pol2'] = 'Suletud (kõik õigused, kaasaarvatud lugemine on lubatud vaid registreeritud kasutajatele)'; $lang['i_retry'] = 'Proovi uuesti'; -$lang['mu_gridname'] = 'Failinimi'; -$lang['mu_gridsize'] = 'Suurus'; -$lang['mu_gridstat'] = 'Staatus'; -$lang['mu_browse'] = 'Sirvi'; -$lang['mu_toobig'] = 'liiga suur'; -$lang['mu_ready'] = 'valmis üleslaadimiseks'; -$lang['mu_done'] = 'valmis'; -$lang['mu_fail'] = 'ebaõnnestus'; -$lang['mu_lasterr'] = 'Viimane viga:'; diff --git a/inc/lang/eu/lang.php b/inc/lang/eu/lang.php index d02f281c3..367dfb5b5 100644 --- a/inc/lang/eu/lang.php +++ b/inc/lang/eu/lang.php @@ -256,21 +256,6 @@ $lang['i_pol1'] = 'Wiki Publikoa (irakurri edonorentzat, idatzi e $lang['i_pol2'] = 'Wiki Itxia (irakurri, idatzi, fitxategiak igo erregistratutako erabiltzaileentzat soilik)'; $lang['i_retry'] = 'Berriz saiatu'; $lang['i_license'] = 'Mesedez, aukeratu zein lizentzipean ezarri nahi duzun zure edukia:'; -$lang['mu_intro'] = 'Hemen hainbat fitxategi aldi berean igo ditzakezu. Egin klik nabigazio botoian hauek ilarara gehitzeko. Sakatu igo botoia prest egotean.'; -$lang['mu_gridname'] = 'Fitxategi izena'; -$lang['mu_gridsize'] = 'Tamaina'; -$lang['mu_gridstat'] = 'Egoera'; -$lang['mu_namespace'] = 'Izen-espazioa'; -$lang['mu_browse'] = 'Nabigatu'; -$lang['mu_toobig'] = 'handiegia'; -$lang['mu_ready'] = 'igotzeko prest'; -$lang['mu_done'] = 'amaitua'; -$lang['mu_fail'] = 'hutsegitea'; -$lang['mu_authfail'] = 'saioa iraungita'; -$lang['mu_progress'] = '@PCT@% igota'; -$lang['mu_filetypes'] = 'Onartutako Fitxategi Motak'; -$lang['mu_info'] = 'igotako fitxategiak.'; -$lang['mu_lasterr'] = 'Azken errorea;'; $lang['recent_global'] = 'Une honetan %s izen-espazioaren barneko aldaketak ikusten ari zara. Wiki osoaren azken aldaketak ere ikusi ditzakezu.'; $lang['years'] = 'duela %d urte'; $lang['months'] = 'duela %d hilabete'; diff --git a/inc/lang/fa/lang.php b/inc/lang/fa/lang.php index ac14ce07a..6609d243d 100644 --- a/inc/lang/fa/lang.php +++ b/inc/lang/fa/lang.php @@ -263,21 +263,6 @@ $lang['i_pol1'] = 'ویکی عمومی (همه می‌توانن $lang['i_pol2'] = 'ویکی بسته (فقط کاربران ثبت شده می‌توانند بخوانند، بنویسند و فایل ارسال کنند)'; $lang['i_retry'] = 'تلاش مجدد'; $lang['i_license'] = 'لطفن مجوز این محتوا را وارد کنید:'; -$lang['mu_intro'] = 'شما می‌توانید چندین فایل را با یک حرکت ارسال کنید. روی دکمه‌ی «بچر» کلیک کنید و فایل‌ها را به صف ارسال اضافه نمایید. سپس دکمه‌ی «ارسال» را فشار دهید. '; -$lang['mu_gridname'] = 'نام فایل'; -$lang['mu_gridsize'] = 'اندازه'; -$lang['mu_gridstat'] = 'وضعیت'; -$lang['mu_namespace'] = 'فضای‌نام'; -$lang['mu_browse'] = 'بچر'; -$lang['mu_toobig'] = 'خیلی بزرگ'; -$lang['mu_ready'] = 'آماده‌ی ارسال'; -$lang['mu_done'] = 'کامل'; -$lang['mu_fail'] = 'شکست خورد'; -$lang['mu_authfail'] = 'سشن به پایان رسید'; -$lang['mu_progress'] = '@PCT@% ارسال شد'; -$lang['mu_filetypes'] = 'توسعه‌های مجاز'; -$lang['mu_info'] = 'فایل ارسال گردید'; -$lang['mu_lasterr'] = 'آخرین خطا:'; $lang['recent_global'] = 'شما هم‌اکنون تغییرات فضای‌نام %s را مشاهده می‌کنید. شما هم‌چنین می‌توانید تغییرات اخیر در کل ویکی را مشاهده نمایید.'; $lang['years'] = '%d سال پیش'; $lang['months'] = '%d ماه پیش'; diff --git a/inc/lang/fi/lang.php b/inc/lang/fi/lang.php index 3477f15a3..eb2f57b0e 100644 --- a/inc/lang/fi/lang.php +++ b/inc/lang/fi/lang.php @@ -279,21 +279,6 @@ $lang['i_pol1'] = 'Julkinen Wiki (luku kaikilla, kirjoitus ja tie $lang['i_pol2'] = 'Suljettu Wiki (luku, kirjoitus ja tiedostojen lähetys vain rekisteröityneillä käyttäjillä)'; $lang['i_retry'] = 'Yritä uudelleen'; $lang['i_license'] = 'Valitse lisenssi, jonka alle haluat sisältösi laittaa:'; -$lang['mu_intro'] = 'Täällä voit lähettää useampia tiedostoja kerralla. Klikkaa Selaa-nappia lisätäksesi ne jonoon. Paina lähetä, kun olet valmis.'; -$lang['mu_gridname'] = 'Tiedoston nimi'; -$lang['mu_gridsize'] = 'Koko'; -$lang['mu_gridstat'] = 'Tilanne'; -$lang['mu_namespace'] = 'Nimiavaruus'; -$lang['mu_browse'] = 'Selaa'; -$lang['mu_toobig'] = 'liian iso'; -$lang['mu_ready'] = 'valmis lähetettäväksi'; -$lang['mu_done'] = 'valmis'; -$lang['mu_fail'] = 'epäonnistui'; -$lang['mu_authfail'] = 'istunto on vanhentunut'; -$lang['mu_progress'] = '@PCT@% lähetetty'; -$lang['mu_filetypes'] = 'Sallitut tyypit'; -$lang['mu_info'] = 'tiedostoa ladattu.'; -$lang['mu_lasterr'] = 'Edellinen virhe:'; $lang['recent_global'] = 'Seuraat tällä hetkellä muutoksia nimiavaruuden %s sisällä. Voit myös katsoa muutoksia koko wikissä'; $lang['years'] = '%d vuotta sitten'; $lang['months'] = '%d kuukautta sitten'; diff --git a/inc/lang/fr/lang.php b/inc/lang/fr/lang.php index f92ea92d9..309ac22e3 100644 --- a/inc/lang/fr/lang.php +++ b/inc/lang/fr/lang.php @@ -292,21 +292,6 @@ $lang['i_pol1'] = 'Wiki public (lecture pour tout le monde, écri $lang['i_pol2'] = 'Wiki fermé (lecture, écriture, envoi de fichiers pour les utilisateurs enregistrés uniquement)'; $lang['i_retry'] = 'Réessayer'; $lang['i_license'] = 'Veuillez choisir la licence sous laquelle placer votre contenu :'; -$lang['mu_intro'] = 'Ici vous pouvez envoyer plusieurs fichiers en même temps. Cliquez sur le bouton parcourir pour les ajouter. Cliquez sur envoyer lorsque c\'est prêt. '; -$lang['mu_gridname'] = 'Nom du fichier'; -$lang['mu_gridsize'] = 'Taille'; -$lang['mu_gridstat'] = 'État'; -$lang['mu_namespace'] = 'Catégorie'; -$lang['mu_browse'] = 'Parcourir'; -$lang['mu_toobig'] = 'Trop gros'; -$lang['mu_ready'] = 'Prêt à envoyer'; -$lang['mu_done'] = 'Terminé'; -$lang['mu_fail'] = 'Échoué'; -$lang['mu_authfail'] = 'Session expirée'; -$lang['mu_progress'] = '@PCT@% envoyé'; -$lang['mu_filetypes'] = 'Types de fichiers acceptés'; -$lang['mu_info'] = 'fichiers envoyés.'; -$lang['mu_lasterr'] = 'Dernière erreur : '; $lang['recent_global'] = 'Vous êtes actuellement en train de regarder les modifications au sein de la catégorie %s. Vous pouvez aussi voir les récentes modifications sur tout le wiki.'; $lang['years'] = 'il y a %d ans'; $lang['months'] = 'il y a %d mois'; diff --git a/inc/lang/gl/lang.php b/inc/lang/gl/lang.php index a4c218510..329820333 100644 --- a/inc/lang/gl/lang.php +++ b/inc/lang/gl/lang.php @@ -280,21 +280,6 @@ $lang['i_pol1'] = 'Wiki Público (lectura para todas as persoas, $lang['i_pol2'] = 'Wiki Fechado (lectura, escritura, subida de arquivos só para usuarios rexistrados)'; $lang['i_retry'] = 'Tentar de novo'; $lang['i_license'] = 'Por favor escolla a licenza para o contido:'; -$lang['mu_intro'] = 'Aquí podes subir varios arquivos de vez. Preme o botón Navegar para engadilos á cola. Preme en Subir cando remates.'; -$lang['mu_gridname'] = 'Nome de Arquivo'; -$lang['mu_gridsize'] = 'Tamaño'; -$lang['mu_gridstat'] = 'Estado'; -$lang['mu_namespace'] = 'Nome de Espazo'; -$lang['mu_browse'] = 'Navegar'; -$lang['mu_toobig'] = 'grande de máis'; -$lang['mu_ready'] = 'disposto para subir'; -$lang['mu_done'] = 'feito'; -$lang['mu_fail'] = 'fallou'; -$lang['mu_authfail'] = 'sesión expirada'; -$lang['mu_progress'] = '@PCT@% subido'; -$lang['mu_filetypes'] = 'Tipos de arquivo Permitidos'; -$lang['mu_info'] = 'arquivos subidos.'; -$lang['mu_lasterr'] = 'Último erro:'; $lang['recent_global'] = 'Agora mesmo estás a ver os trocos no nome de espazo %s. Tamén podes ver os trocos recentes no Wiki enteiro.'; $lang['years'] = 'hai %d anos'; $lang['months'] = 'hai %d meses'; diff --git a/inc/lang/he/lang.php b/inc/lang/he/lang.php index f295e44a9..1c0c82212 100644 --- a/inc/lang/he/lang.php +++ b/inc/lang/he/lang.php @@ -259,21 +259,6 @@ $lang['i_pol1'] = ' ויקי ציבורי (קריאה לכולם, $lang['i_pol2'] = 'ויקי סגור (קריאה, כתיבה והעלאה למשתמשים רשומים בלבד)'; $lang['i_retry'] = 'ניסיון נוסף'; $lang['i_license'] = 'נא לבחור את הרישיון שיחול על התוכן שבוויקי שלך:'; -$lang['mu_intro'] = 'דרך כאן ניתן להעלות מספר קבצים בבת אחת. יש ללחוץ על לחצן החיפוש להוסיף אותם למחסנית. ניתן ללחוץ על העלאה לסיום.'; -$lang['mu_gridname'] = 'שם הקובץ'; -$lang['mu_gridsize'] = 'גודל'; -$lang['mu_gridstat'] = 'מצב'; -$lang['mu_namespace'] = 'מרחב שם'; -$lang['mu_browse'] = 'חיפוש'; -$lang['mu_toobig'] = 'גדול מדי'; -$lang['mu_ready'] = 'בהמתנה להעלאה'; -$lang['mu_done'] = 'הסתיים'; -$lang['mu_fail'] = 'נכשל'; -$lang['mu_authfail'] = 'תוקף ההפעלה פג'; -$lang['mu_progress'] = '@PCT@% הועלה'; -$lang['mu_filetypes'] = 'סוגי קבצים מורשים'; -$lang['mu_info'] = 'הקבצים הועלו'; -$lang['mu_lasterr'] = 'שגיאה אחרונה:'; $lang['recent_global'] = 'נכון לעכשיו מתנהל על ידיך מעקב אחר מרחב השם %s. כמו כן, באפשרותך לצפות בשינויים האחרונים בוויקי כולו.'; $lang['years'] = 'לפני %d שנים'; $lang['months'] = 'לפני %d חודשים'; diff --git a/inc/lang/hi/lang.php b/inc/lang/hi/lang.php index 00e5589d8..2a9e20a9e 100644 --- a/inc/lang/hi/lang.php +++ b/inc/lang/hi/lang.php @@ -116,10 +116,3 @@ $lang['i_installer'] = 'डोकुविकी इंस्टॉल $lang['i_wikiname'] = 'विकी का नाम'; $lang['i_superuser'] = 'महाउपयोगकर्ता'; $lang['i_retry'] = 'पुनःप्रयास'; -$lang['mu_gridsize'] = 'आकार'; -$lang['mu_gridstat'] = 'स्थिति'; -$lang['mu_browse'] = 'ब्राउज़'; -$lang['mu_toobig'] = 'बहुत बड़ा'; -$lang['mu_ready'] = 'अपलोड करने के लिए तैयार'; -$lang['mu_done'] = 'पूर्ण'; -$lang['mu_fail'] = 'असफल'; diff --git a/inc/lang/hr/lang.php b/inc/lang/hr/lang.php index ef10d7720..79a6cc3b0 100644 --- a/inc/lang/hr/lang.php +++ b/inc/lang/hr/lang.php @@ -257,21 +257,6 @@ $lang['i_pol1'] = 'Javni Wiki (čitanje za sve, pisanje i učitav $lang['i_pol2'] = 'Zatvoreni Wiki (čitanje, pisanje, učitavanje samo za registrirane korisnike)'; $lang['i_retry'] = 'Pokušaj ponovo'; $lang['i_license'] = 'Molim odaberite licencu pod kojom želite postavljati vaš sadržaj:'; -$lang['mu_intro'] = 'Ovdje možeš učitati više datoteka odjednom. Klikni gumb pregled te ih dodajte u red. Pritisnite učitaj kad ste gotovi.'; -$lang['mu_gridname'] = 'Naziv datoteke'; -$lang['mu_gridsize'] = 'Veličina'; -$lang['mu_gridstat'] = 'Status'; -$lang['mu_namespace'] = 'Imenski prostor'; -$lang['mu_browse'] = 'Pregled'; -$lang['mu_toobig'] = 'prevelik'; -$lang['mu_ready'] = 'spremno za učitavanje'; -$lang['mu_done'] = 'gotovo'; -$lang['mu_fail'] = 'nije uspio'; -$lang['mu_authfail'] = 'sjednica istekla'; -$lang['mu_progress'] = '@PCT@% učitan'; -$lang['mu_filetypes'] = 'Dozvoljeni tipovi datoteka'; -$lang['mu_info'] = 'datoteke učitane.'; -$lang['mu_lasterr'] = 'Posljednja greška:'; $lang['recent_global'] = 'Trenutno gledate promjene unutar %s imenskog prostora. Također možete vidjeti zadnje promjene cijelog wiki-a'; $lang['years'] = '%d godina prije'; $lang['months'] = '%d mjeseci prije'; diff --git a/inc/lang/hu/lang.php b/inc/lang/hu/lang.php index 23419a2bd..a44fd9317 100644 --- a/inc/lang/hu/lang.php +++ b/inc/lang/hu/lang.php @@ -262,21 +262,6 @@ $lang['i_pol1'] = 'Publikus Wiki (mindenki olvashatja, de csak re $lang['i_pol2'] = 'Zárt Wiki (csak regisztrált felhasználók olvashatják, írhatják és tölthetnek fel fájlokat)'; $lang['i_retry'] = 'Újra'; $lang['i_license'] = 'Kérlek válassz licenszt a feltöltött tartalomhoz:'; -$lang['mu_intro'] = 'Itt több fájlt is fel tudsz tölteni egyszerre. Kattints a "Kiválaszt" gombra és add hozzá a listához. Nyomd meg a Feltöltés gombot, amikor elkészültél.'; -$lang['mu_gridname'] = 'Fájlnév'; -$lang['mu_gridsize'] = 'Méret'; -$lang['mu_gridstat'] = 'Állapot'; -$lang['mu_namespace'] = 'Névtér'; -$lang['mu_browse'] = 'Kiválaszt'; -$lang['mu_toobig'] = 'túl nagy'; -$lang['mu_ready'] = 'feltöltésre kész'; -$lang['mu_done'] = 'kész'; -$lang['mu_fail'] = 'hibás'; -$lang['mu_authfail'] = 'session lejárt'; -$lang['mu_progress'] = '@PCT@% feltöltve'; -$lang['mu_filetypes'] = 'Megengedett fájltípusok'; -$lang['mu_info'] = 'Fájlok feltöltve.'; -$lang['mu_lasterr'] = 'Utolsó hiba:'; $lang['recent_global'] = 'Jelenleg csak a %s névtér friss változásai látszanak. Megtekinthetők a teljes wiki friss változásai is.'; $lang['years'] = '%d évvel ezelőtt'; $lang['months'] = '%d hónappal ezelőtt'; diff --git a/inc/lang/ia/lang.php b/inc/lang/ia/lang.php index 8398f29f0..c336d8541 100644 --- a/inc/lang/ia/lang.php +++ b/inc/lang/ia/lang.php @@ -257,21 +257,6 @@ $lang['i_pol0'] = 'Wiki aperte (lectura, scriptura, incargamento $lang['i_pol1'] = 'Wiki public (lectura pro omnes, scriptura e incargamento pro usatores registrate)'; $lang['i_pol2'] = 'Wiki claudite (lectura, scriptura e incargamento solmente pro usatores registrate)'; $lang['i_retry'] = 'Reprobar'; -$lang['mu_intro'] = 'Hic tu pote incargar plure files insimul. Clicca super le button Navigar pro adder los al cauda. Preme Incargar quando tu ha finite.'; -$lang['mu_gridname'] = 'Nomine de file'; -$lang['mu_gridsize'] = 'Dimension'; -$lang['mu_gridstat'] = 'Stato'; -$lang['mu_namespace'] = 'Spatio de nomines'; -$lang['mu_browse'] = 'Navigar'; -$lang['mu_toobig'] = 'troppo grande'; -$lang['mu_ready'] = 'preste pro incargamento'; -$lang['mu_done'] = 'complete'; -$lang['mu_fail'] = 'fallite'; -$lang['mu_authfail'] = 'session expirate'; -$lang['mu_progress'] = '@PCT@% incargate'; -$lang['mu_filetypes'] = 'Typos de file permittite'; -$lang['mu_info'] = 'files incargate.'; -$lang['mu_lasterr'] = 'Ultime error:'; $lang['recent_global'] = 'Tu observa actualmente le modificationes intra le spatio de nomines %s. Tu pote etiam vider le modificationes recente de tote le wiki.'; $lang['years'] = '%d annos retro'; $lang['months'] = '%d menses retro'; diff --git a/inc/lang/id/lang.php b/inc/lang/id/lang.php index e8026acee..9df252225 100644 --- a/inc/lang/id/lang.php +++ b/inc/lang/id/lang.php @@ -197,14 +197,3 @@ $lang['i_pol0'] = 'Wiki Terbuka (baca, tulis, upload untuk semua $lang['i_pol1'] = 'Wiki Publik (baca untuk semua orang, tulis dan upload untuk pengguna terdaftar)'; $lang['i_pol2'] = 'Wiki Privat (baca, tulis dan upload hanya untuk pengguna terdaftar)'; $lang['i_retry'] = 'Coba Lagi'; -$lang['mu_gridname'] = 'Nama file'; -$lang['mu_gridsize'] = 'Ukuran'; -$lang['mu_gridstat'] = 'Status'; -$lang['mu_namespace'] = 'Namaspace'; -$lang['mu_browse'] = 'Jelajah'; -$lang['mu_ready'] = 'Siap untuk uplod'; -$lang['mu_done'] = 'Selesai'; -$lang['mu_fail'] = 'Gagal'; -$lang['mu_authfail'] = 'sesi habis'; -$lang['mu_progress'] = '@PCT@% uploaded'; -$lang['mu_filetypes'] = 'Izinkan tipe file'; diff --git a/inc/lang/is/lang.php b/inc/lang/is/lang.php index 0e281e58d..caf098ee6 100644 --- a/inc/lang/is/lang.php +++ b/inc/lang/is/lang.php @@ -185,10 +185,3 @@ $lang['img_format'] = 'Forsnið'; $lang['img_camera'] = 'Myndavél'; $lang['img_keywords'] = 'Lykilorðir'; $lang['i_retry'] = 'Reyna aftur'; -$lang['mu_gridsize'] = 'Stærð'; -$lang['mu_toobig'] = 'of stór'; -$lang['mu_ready'] = 'tilbúin til upphleðslu'; -$lang['mu_done'] = 'lokið'; -$lang['mu_fail'] = 'mistókst'; -$lang['mu_info'] = 'Skrár innhlaðnar.'; -$lang['mu_lasterr'] = 'Síðasta villa:'; diff --git a/inc/lang/it/lang.php b/inc/lang/it/lang.php index ebbe983de..dfe7818e9 100644 --- a/inc/lang/it/lang.php +++ b/inc/lang/it/lang.php @@ -262,21 +262,6 @@ $lang['i_pol1'] = 'Wiki Pubblico (lettura per tutti, scrittura e $lang['i_pol2'] = 'Wiki Chiuso (lettura, scrittura, caricamento file solamente per gli utenti registrati)'; $lang['i_retry'] = 'Riprova'; $lang['i_license'] = 'Per favore scegli la licenza sotto cui vuoi rilasciare il contenuto:'; -$lang['mu_intro'] = 'Qui si possono caricare più di un file alla volta. Scegliere "Sfoglia..." per aggiungere file alla coda. Alla fine, fai click su "Invia file".'; -$lang['mu_gridname'] = 'Nome file'; -$lang['mu_gridsize'] = 'Dimensione'; -$lang['mu_gridstat'] = 'Stato'; -$lang['mu_namespace'] = 'Categoria'; -$lang['mu_browse'] = 'Sfoglia'; -$lang['mu_toobig'] = 'troppo grande'; -$lang['mu_ready'] = 'pronto per caricare'; -$lang['mu_done'] = 'completo'; -$lang['mu_fail'] = 'fallito'; -$lang['mu_authfail'] = 'sessione scaduta'; -$lang['mu_progress'] = '@PCT@% caricato'; -$lang['mu_filetypes'] = 'Tipi di file permessi'; -$lang['mu_info'] = 'file caricati.'; -$lang['mu_lasterr'] = 'Ultimo errore:'; $lang['recent_global'] = 'Stai attualmente vedendo le modifiche effettuate nell\'area %s. Puoi anche vedere le modifiche recenti dell\'intero wiki.'; $lang['years'] = '%d anni fa'; $lang['months'] = '%d mesi fa'; diff --git a/inc/lang/ja/lang.php b/inc/lang/ja/lang.php index 15c1e7dd6..0c428ad64 100644 --- a/inc/lang/ja/lang.php +++ b/inc/lang/ja/lang.php @@ -279,21 +279,6 @@ $lang['i_pol1'] = 'パブリック Wiki（閲覧は全ての人 $lang['i_pol2'] = 'クローズド Wiki (登録ユーザーにのみ使用を許可)'; $lang['i_retry'] = '再試行'; $lang['i_license'] = 'あなたが作成したコンテンツが属するライセンスを選択してください：'; -$lang['mu_intro'] = '複数のファイルを一度にアップロードできます。ブラウズボタンをクリックしてファイルを追加してください。追加したら、アップロードボタンをクリックしてください。'; -$lang['mu_gridname'] = 'ファイル名'; -$lang['mu_gridsize'] = 'サイズ'; -$lang['mu_gridstat'] = 'ステータス'; -$lang['mu_namespace'] = '名前空間'; -$lang['mu_browse'] = 'ブラウズ'; -$lang['mu_toobig'] = '大きすぎます'; -$lang['mu_ready'] = 'アップロードできます'; -$lang['mu_done'] = '完了'; -$lang['mu_fail'] = '失敗'; -$lang['mu_authfail'] = 'セッション期限切れ'; -$lang['mu_progress'] = '@PCT@% アップロード完了'; -$lang['mu_filetypes'] = '使用できるファイル形式'; -$lang['mu_info'] = 'ファイルアップロード完了'; -$lang['mu_lasterr'] = '直近のエラー：'; $lang['recent_global'] = '現在、%s 名前空間内の変更点を閲覧中です。Wiki全体の最近の変更点を確認することも可能です。'; $lang['years'] = '%d年前'; $lang['months'] = '%dカ月前'; diff --git a/inc/lang/ko/lang.php b/inc/lang/ko/lang.php index 91825c797..b0664e7f4 100644 --- a/inc/lang/ko/lang.php +++ b/inc/lang/ko/lang.php @@ -262,21 +262,6 @@ $lang['i_pol1'] = '공개형 위키 (누구나 읽을 수 있지 $lang['i_pol2'] = '폐쇄형 위키 (등록된 사용자만 읽기/쓰기/업로드가 가능합니다.)'; $lang['i_retry'] = '다시 시도'; $lang['i_license'] = '내용의 배포를 위한 라이센스를 선택하세요.'; -$lang['mu_intro'] = '여러 파일을 한번에 업로드할 수 있습니다. 파일 목록에 추가하려면 "찾기" 버튼을 클릭합니다. 파일 목록 추가 작업이 끝나면 "업로드" 버튼을 클릭하기 바랍니다. '; -$lang['mu_gridname'] = '파일명'; -$lang['mu_gridsize'] = '크기'; -$lang['mu_gridstat'] = '상태'; -$lang['mu_namespace'] = '네임스페이스'; -$lang['mu_browse'] = '찾기'; -$lang['mu_toobig'] = '업로드 가능 크기를 초과했습니다.'; -$lang['mu_ready'] = '업로드가 가능합니다.'; -$lang['mu_done'] = '업로드가 완료되었습니다.'; -$lang['mu_fail'] = '업로드가 실패했습니다.'; -$lang['mu_authfail'] = '세션 기간이 종료되었습니다.'; -$lang['mu_progress'] = '@PCT@% 업로드되었습니다.'; -$lang['mu_filetypes'] = '허용된 파일타입'; -$lang['mu_info'] = '업로드 되었습니다.'; -$lang['mu_lasterr'] = '마지막 에러:'; $lang['recent_global'] = '%s 네임스페이스를 구독중입니다. 전체위키 변경사항 도 보실수 있습니다.'; $lang['years'] = '%d 년 전'; $lang['months'] = '%d 개월 전'; diff --git a/inc/lang/la/lang.php b/inc/lang/la/lang.php index e8d79a997..25102d583 100644 --- a/inc/lang/la/lang.php +++ b/inc/lang/la/lang.php @@ -256,21 +256,6 @@ $lang['i_pol1'] = 'Publicus uicis (omnes legere, Sodales scribere $lang['i_pol2'] = 'Clausus uicis (Soli Sodales legere scribere et onerare poccunt)'; $lang['i_retry'] = 'Rursum temptas'; $lang['i_license'] = 'Elige facultatem sub qua tuus uicis est:'; -$lang['mu_intro'] = 'Plura documenta uno tempore onerare potes.'; -$lang['mu_gridname'] = 'Documenti nomen'; -$lang['mu_gridsize'] = 'Pondus'; -$lang['mu_gridstat'] = 'Status'; -$lang['mu_namespace'] = 'Genus'; -$lang['mu_browse'] = 'Euoluere'; -$lang['mu_toobig'] = 'Ponderosius'; -$lang['mu_ready'] = 'Aptus ad onerandum'; -$lang['mu_done'] = 'Perfectum'; -$lang['mu_fail'] = 'Error'; -$lang['mu_authfail'] = 'Sessio exit'; -$lang['mu_progress'] = '@PCT@% oneratum'; -$lang['mu_filetypes'] = 'Genera documenti apta facere'; -$lang['mu_info'] = 'Documenta onerare'; -$lang['mu_lasterr'] = 'Extremus error:'; $lang['recent_global'] = 'Mutatione in hoc genere uides. Recentiores mutationes quoque uidere potes'; $lang['years'] = 'ab annis %d'; $lang['months'] = 'a mensibus %d'; diff --git a/inc/lang/lb/lang.php b/inc/lang/lb/lang.php index 00692f48e..d16d1a0c3 100644 --- a/inc/lang/lb/lang.php +++ b/inc/lang/lb/lang.php @@ -189,21 +189,6 @@ $lang['i_pol0'] = 'Oppene Wiki (liese, schreiwen an eroplueden fi $lang['i_pol1'] = 'Ëffentleche Wiki (liesen fir jidfereen, schreiwen an eroplueden fir registréiert Benotzer)'; $lang['i_pol2'] = 'Zouene Wiki (liesen, schreiwen, eroplueden nëmme fir registréiert Benotzer)'; $lang['i_retry'] = 'Nach eng Kéier probéieren'; -$lang['mu_intro'] = 'Hei kanns de méi Dateie mateneen eroplueden. Klick op den Duerchsiche-Knäppchen fir se an d\'Schlaang ze setzen. Dréck op Eroplueden wanns de fäerdeg bass.'; -$lang['mu_gridname'] = 'Dateinumm'; -$lang['mu_gridsize'] = 'Gréisst'; -$lang['mu_gridstat'] = 'Status'; -$lang['mu_namespace'] = 'Namespace'; -$lang['mu_browse'] = 'Duerchsichen'; -$lang['mu_toobig'] = 'ze grouss'; -$lang['mu_ready'] = 'prett fir eropzelueden'; -$lang['mu_done'] = 'fäerdeg'; -$lang['mu_fail'] = 'feelgeschloen'; -$lang['mu_authfail'] = 'Sessioun ofgelaf'; -$lang['mu_progress'] = '@PCT@% eropgelueden'; -$lang['mu_filetypes'] = 'Erlaabten Dateitypen'; -$lang['mu_info'] = 'Dateien eropgelueden.'; -$lang['mu_lasterr'] = 'Leschte Feeler:'; $lang['recent_global'] = 'Du kucks am Moment d\'Ännerungen innerhalb vum %s Namespace. Du kanns och d\'Kierzilech Ännerungen vum ganze Wiki kucken.'; $lang['years'] = 'virun %d Joer'; $lang['months'] = 'virun %d Méint'; diff --git a/inc/lang/lt/lang.php b/inc/lang/lt/lang.php index d14a0695a..50fb3194b 100644 --- a/inc/lang/lt/lang.php +++ b/inc/lang/lt/lang.php @@ -190,14 +190,3 @@ $lang['i_wikiname'] = 'Wiki vardas'; $lang['i_enableacl'] = 'Įjungti ACL (rekomenduojama)'; $lang['i_superuser'] = 'Supervartotojas'; $lang['i_problems'] = 'Instaliavimo metu buvo klaidų, kurios pateiktos žemiau. Tęsti negalima, kol nebus pašalintos priežastys.'; -$lang['mu_gridname'] = 'Failo vardas'; -$lang['mu_gridsize'] = 'Dydis'; -$lang['mu_gridstat'] = 'Statusas'; -$lang['mu_namespace'] = 'Vardų sritis'; -$lang['mu_browse'] = 'Browse'; -$lang['mu_toobig'] = 'perdidelis'; -$lang['mu_ready'] = 'paruošta įkrovimui'; -$lang['mu_done'] = 'užbaigta'; -$lang['mu_fail'] = 'nepavyko'; -$lang['mu_authfail'] = 'sesija nutraukta'; -$lang['mu_filetypes'] = 'Leidžiami failų tipai'; diff --git a/inc/lang/lv/lang.php b/inc/lang/lv/lang.php index 37a0bf6a9..f88302f2f 100644 --- a/inc/lang/lv/lang.php +++ b/inc/lang/lv/lang.php @@ -274,21 +274,6 @@ $lang['i_pol1'] = 'Publisks Wiki (lasa ikviens, raksta un augšup $lang['i_pol2'] = 'Slēgts Wiki (raksta, lasa un augšupielādē tikai reģistrēti lietotāji)'; $lang['i_retry'] = 'Atkārtot'; $lang['i_license'] = 'Ar kādu licenci saturs tiks publicēts:'; -$lang['mu_intro'] = 'Šeit var augšupielādēt uzreiz vairāku failus. Uzklikšķini Pārlūkot pogai, lai tos ieliktu rindā. Nospied Augšupielādēt, kad rinda sastādīta.'; -$lang['mu_gridname'] = 'Faila vārds'; -$lang['mu_gridsize'] = 'Izmērs'; -$lang['mu_gridstat'] = 'Statuss'; -$lang['mu_namespace'] = 'Nodaļa'; -$lang['mu_browse'] = 'Pārlūkot'; -$lang['mu_toobig'] = 'par lielu'; -$lang['mu_ready'] = 'gatavs augšupielādei'; -$lang['mu_done'] = 'pabeigts'; -$lang['mu_fail'] = 'neizdevās'; -$lang['mu_authfail'] = 'sesijas laiks iztecējis'; -$lang['mu_progress'] = '@PCT@% augšupielādēts'; -$lang['mu_filetypes'] = 'Atļautie failu tipi'; -$lang['mu_info'] = 'faili ir augšupielādēti.'; -$lang['mu_lasterr'] = 'Pēdējā ķļūda.'; $lang['recent_global'] = 'Tu skati izmaiņas nodaļā %s. Ir iespējams skatīt jaunākos grozījums visā viki. '; $lang['years'] = 'pirms %d gadiem'; $lang['months'] = 'pirms %d mēnešiem'; diff --git a/inc/lang/mk/lang.php b/inc/lang/mk/lang.php index ca4a746cd..6614444d0 100644 --- a/inc/lang/mk/lang.php +++ b/inc/lang/mk/lang.php @@ -223,20 +223,6 @@ $lang['i_pol0'] = 'Отвори вики (читај, запиш $lang['i_pol1'] = 'Јавно вики (читај за сите, запиши и качи за регистрирани корисници)'; $lang['i_pol2'] = 'Затворено вики (читај, запиши, качи само за регистрирани корисници)'; $lang['i_retry'] = 'Пробај повторно'; -$lang['mu_intro'] = 'Овде можете да прикачите повеќе датотеки од еднаш. Кликнете на копчето за пребарување за да ги додадете во редица. Притиснете на качи кога е готово.'; -$lang['mu_gridname'] = 'Име на датотека'; -$lang['mu_gridsize'] = 'Големина'; -$lang['mu_gridstat'] = 'Состојба'; -$lang['mu_browse'] = 'Пребарај'; -$lang['mu_toobig'] = 'премногу голема'; -$lang['mu_ready'] = 'спремна за качување'; -$lang['mu_done'] = 'комплетно'; -$lang['mu_fail'] = 'неуспешно'; -$lang['mu_authfail'] = 'сесијата истече'; -$lang['mu_progress'] = '@PCT@% качено'; -$lang['mu_filetypes'] = 'Дозволено типови на датотеки'; -$lang['mu_info'] = 'качени датотеки.'; -$lang['mu_lasterr'] = 'Последна грешка: '; $lang['years'] = 'пред %d години'; $lang['months'] = 'пред %d месеци'; $lang['weeks'] = 'пред %d недели'; diff --git a/inc/lang/mr/lang.php b/inc/lang/mr/lang.php index 63fda3e5a..314a319cd 100644 --- a/inc/lang/mr/lang.php +++ b/inc/lang/mr/lang.php @@ -209,17 +209,4 @@ $lang['i_pol0'] = 'मुक्त विकी ( सर्वा $lang['i_pol1'] = 'सार्वजनिक विकी ( सर्वांना वाचण्याची मुभा , लेखन व अपलोडची परवानगी फक्त नोंदणीकृत सदस्यांना )'; $lang['i_pol2'] = 'बंदिस्त विकी ( वाचन , लेखन व अपलोडची परवानगी फक्त नोंदणीकृत सदस्यांना ) '; $lang['i_retry'] = 'पुन्हा प्रयत्न'; -$lang['mu_intro'] = 'इथे तुम्ही एकापेक्षा अधिक फाइल अपलोड करू शकता. ब्राउझ च्या बटणावर क्लिक करून त्याना लिस्ट मधे टाका. सगळ्या टाकुन झाल्यावर अपलोड च्या बटणावर क्लिक करा.'; -$lang['mu_gridname'] = 'फाइल नाम'; -$lang['mu_gridsize'] = 'साइज'; -$lang['mu_gridstat'] = 'स्थिति'; -$lang['mu_namespace'] = 'नेमस्पेस'; -$lang['mu_browse'] = 'ब्राउझ'; -$lang['mu_toobig'] = 'अति मोठे'; -$lang['mu_ready'] = 'अपलोडसाठी तयार'; -$lang['mu_done'] = 'पूर्ण'; -$lang['mu_fail'] = 'अयशस्वी'; -$lang['mu_authfail'] = 'सेशन संपला'; -$lang['mu_progress'] = '@PCT@% अपलोड झाले'; -$lang['mu_filetypes'] = 'मान्य फाइल टाइप'; $lang['recent_global'] = 'तुम्ही सध्या %s या नेमस्पेस मधील बदल पाहात आहात.तुम्ही पूर्ण विकी मधले बदल सुद्धा पाहू शकता.'; diff --git a/inc/lang/ne/lang.php b/inc/lang/ne/lang.php index 97e2dde5c..21f979753 100644 --- a/inc/lang/ne/lang.php +++ b/inc/lang/ne/lang.php @@ -200,17 +200,4 @@ $lang['i_pol0'] = 'खुल्ला विकि (पठन, $lang['i_pol1'] = 'Public विकि (पठन सवैका लागि,लेखन र अपलोड दर्ता गरिएका प्रयपगकर्ताका लागि ) '; $lang['i_pol2'] = 'बन्द विकि (पठन , लेखन, अपलोड ) दर्ता भएका प्रयोगकर्ताका लागि मात्र ।'; $lang['i_retry'] = 'पुन: प्रयास गर्नुहोस् '; -$lang['mu_intro'] = 'तपाईले धेरै वटा फाइलहरु एकै पटक अपलोड गर्न सक्नुहुन्छ । browse थिच्नुहोस् अनि सुचीमा थप्नुहोस् । सकिएपछि अपलोड थिछ्चुहोस् ।'; -$lang['mu_gridname'] = 'फाइलनाम '; -$lang['mu_gridsize'] = 'आकार'; -$lang['mu_gridstat'] = 'स्थिति'; -$lang['mu_namespace'] = 'नेमस्पेस'; -$lang['mu_browse'] = 'Browse'; -$lang['mu_toobig'] = 'धेरै ठूलो'; -$lang['mu_ready'] = 'अपलोडको लागि तयार'; -$lang['mu_done'] = 'पूरा'; -$lang['mu_fail'] = 'असफल'; -$lang['mu_authfail'] = 'सत्र सकियो '; -$lang['mu_progress'] = '@PCT@% अपलोड भयो '; -$lang['mu_filetypes'] = 'समर्थित फाइल प्रकार'; $lang['recent_global'] = 'तपाई अहिले %s नेमस्पेस भित्र भएका परिवर्तन हेर्दैहुनुहुन्छ। तपाई पुरै विकिमा भएको परिवर्तन हेर्न सक्नुहुन्छ.'; diff --git a/inc/lang/nl/lang.php b/inc/lang/nl/lang.php index 542b99c93..64d7d89f7 100644 --- a/inc/lang/nl/lang.php +++ b/inc/lang/nl/lang.php @@ -287,21 +287,6 @@ $lang['i_pol1'] = 'Publieke wiki (lezen voor iedereen, schrijven $lang['i_pol2'] = 'Besloten wiki (lezen, schrijven en uploaden alleen voor geregistreerde gebruikers)'; $lang['i_retry'] = 'Opnieuw'; $lang['i_license'] = 'Kies a.u.b. een licentie die u voor uw inhoud wilt gebruiken:'; -$lang['mu_intro'] = 'Hiier kun je meerdere bestanden tegelijk uploaden. Klik de blader-knop om ze aan de lijst toe te voegen. Klik Upload als je klaar bent.'; -$lang['mu_gridname'] = 'Bestandsnaam'; -$lang['mu_gridsize'] = 'Grootte'; -$lang['mu_gridstat'] = 'Status'; -$lang['mu_namespace'] = 'Namespace'; -$lang['mu_browse'] = 'Blader'; -$lang['mu_toobig'] = 'te groot'; -$lang['mu_ready'] = 'Klaar om te uploaden'; -$lang['mu_done'] = 'klaar'; -$lang['mu_fail'] = 'mislukt'; -$lang['mu_authfail'] = 'sessie beëindigd'; -$lang['mu_progress'] = '@PCT@% geüpload'; -$lang['mu_filetypes'] = 'Toegestane bestandstypes'; -$lang['mu_info'] = 'bestanden geüpload.'; -$lang['mu_lasterr'] = 'Laatste foutmelding:'; $lang['recent_global'] = 'Je bekijkt momenteel de wijzigingen binnen de %s namespace. Je kunt ook de recente wijzigingen van de hele wiki bekijken.'; $lang['years'] = '%d jaar geleden'; $lang['months'] = '%d maand geleden'; diff --git a/inc/lang/no/lang.php b/inc/lang/no/lang.php index 76b59d9b8..5dd5f6ea7 100644 --- a/inc/lang/no/lang.php +++ b/inc/lang/no/lang.php @@ -293,21 +293,6 @@ $lang['i_pol1'] = 'Offentlig Wiki (les for alle, skriving og oppl $lang['i_pol2'] = 'Lukket Wiki (les, skriv og opplasting bare for registrerte brukere)'; $lang['i_retry'] = 'Prøv igjen'; $lang['i_license'] = 'Velg lisens som du vil legge ut innholdet under:'; -$lang['mu_intro'] = 'Her kan du laste opp flere filer samtidig. Klikk på utforsk-knappen for å legge dem til i køen. Klikk på "last opp" når du er ferdig med å velge filene. '; -$lang['mu_gridname'] = 'Filnavn'; -$lang['mu_gridsize'] = 'Størrelse'; -$lang['mu_gridstat'] = 'Status'; -$lang['mu_namespace'] = 'Navnerom'; -$lang['mu_browse'] = 'Utforsk'; -$lang['mu_toobig'] = 'for stor'; -$lang['mu_ready'] = 'klar for opplasting'; -$lang['mu_done'] = 'ferdig'; -$lang['mu_fail'] = 'feilet'; -$lang['mu_authfail'] = 'sesjonen har utløpt'; -$lang['mu_progress'] = '@PCT@% lastet opp'; -$lang['mu_filetypes'] = 'Tillatte filtyper'; -$lang['mu_info'] = 'filer lastet opp.'; -$lang['mu_lasterr'] = 'Siste feilen:'; $lang['recent_global'] = 'Du ser nå på endringene i navnerommet %s. Du kan ogsåse på nylig foretatte endringer for hele wikien.'; $lang['years'] = '%d år siden'; $lang['months'] = '%d måneder siden'; diff --git a/inc/lang/pl/lang.php b/inc/lang/pl/lang.php index 37d842c44..26e1bd5f5 100644 --- a/inc/lang/pl/lang.php +++ b/inc/lang/pl/lang.php @@ -285,21 +285,6 @@ $lang['i_pol1'] = 'Publiczne Wiki (odczyt dla wszystkich, zapis i $lang['i_pol2'] = 'Zamknięte Wiki (odczyt, zapis i dodawanie plików tylko dla zarejestrowanych użytkowników)'; $lang['i_retry'] = 'Spróbuj ponownie'; $lang['i_license'] = 'Wybierz licencję, na warunkach której chcesz udostępniać treści:'; -$lang['mu_intro'] = 'Możesz tutaj wysłać wiele plików na raz. Kliknij przycisk "Przeglądaj" aby dodać je do kolejki. Kliknij "Wyślij" gdy skończysz.'; -$lang['mu_gridname'] = 'Nazwa pliku'; -$lang['mu_gridsize'] = 'Rozmiar'; -$lang['mu_gridstat'] = 'Stan'; -$lang['mu_namespace'] = 'Katalog'; -$lang['mu_browse'] = 'Przeglądaj'; -$lang['mu_toobig'] = 'za duży'; -$lang['mu_ready'] = 'gotowy do wysłania'; -$lang['mu_done'] = 'zakończono'; -$lang['mu_fail'] = 'nie powiodło się'; -$lang['mu_authfail'] = 'sesja wygasła'; -$lang['mu_progress'] = '@PCT@% wysłano'; -$lang['mu_filetypes'] = 'Dozwolone typy plików'; -$lang['mu_info'] = 'wysłanych plików.'; -$lang['mu_lasterr'] = 'Ostatni błąd:'; $lang['recent_global'] = 'W tej chwili przeglądasz zmiany w katalogu %s. Możesz przejrzeć także zmiany w całym wiki.'; $lang['years'] = '%d lat temu'; $lang['months'] = '%d miesięcy temu'; diff --git a/inc/lang/pt-br/lang.php b/inc/lang/pt-br/lang.php index 373590b76..e4dc50ddc 100644 --- a/inc/lang/pt-br/lang.php +++ b/inc/lang/pt-br/lang.php @@ -271,21 +271,6 @@ $lang['i_pol1'] = 'Wiki público (leitura por todos, escrita e en $lang['i_pol2'] = 'Wiki fechado (leitura, escrita e envio de arquivos somente por usuários registrados)'; $lang['i_retry'] = 'Tentar novamente'; $lang['i_license'] = 'Por favor escolha a licença que voce deseja utilizar para seu conteúdo:'; -$lang['mu_intro'] = 'Aqui você pode enviar vários arquivos de uma só vez. Clique no botão de navegação e adicione-os à fila. Pressione Enviar quando estiver pronto.'; -$lang['mu_gridname'] = 'Nome do arquivo'; -$lang['mu_gridsize'] = 'Tamanho'; -$lang['mu_gridstat'] = 'Status'; -$lang['mu_namespace'] = 'Espaço de nomes'; -$lang['mu_browse'] = 'Navegar'; -$lang['mu_toobig'] = 'muito grande'; -$lang['mu_ready'] = 'pronto para enviar'; -$lang['mu_done'] = 'completo'; -$lang['mu_fail'] = 'falhou'; -$lang['mu_authfail'] = 'a sessão expirou'; -$lang['mu_progress'] = '@PCT@% enviado'; -$lang['mu_filetypes'] = 'Tipos de arquivo permitidos'; -$lang['mu_info'] = 'arquivos enviados.'; -$lang['mu_lasterr'] = 'Erro mais recente:'; $lang['recent_global'] = 'Você está observando as alterações dentro do espaço de nomes %s. Também é possível ver as modificações recentes no wiki inteiro.'; $lang['years'] = '%d anos atrás'; $lang['months'] = '%d meses atrás'; diff --git a/inc/lang/pt/lang.php b/inc/lang/pt/lang.php index 2fa8a1ab4..a96598fc3 100644 --- a/inc/lang/pt/lang.php +++ b/inc/lang/pt/lang.php @@ -278,21 +278,6 @@ $lang['i_pol1'] = 'Wiki Público (ler para todos, escrever e carr $lang['i_pol2'] = 'Wiki Fechado (ler, escrever e carregar somente para utilizadores inscritos)'; $lang['i_retry'] = 'Repetir'; $lang['i_license'] = 'Por favor escolha a licença sob a qual quer colocar o seu conteúdo:'; -$lang['mu_intro'] = 'Aqui podes enviar múltiplos ficheiros de uma vez. Clique no botão de navegação para adicioná-los na fila. Premir upload quando pronto.'; -$lang['mu_gridname'] = 'Nome do ficheiro'; -$lang['mu_gridsize'] = 'Tamanho'; -$lang['mu_gridstat'] = 'Estado'; -$lang['mu_namespace'] = 'Espaço de Nomes'; -$lang['mu_browse'] = 'Navegar'; -$lang['mu_toobig'] = 'demasiado grande'; -$lang['mu_ready'] = 'pronto para upload'; -$lang['mu_done'] = 'completo'; -$lang['mu_fail'] = 'falhou'; -$lang['mu_authfail'] = 'sessão expirada'; -$lang['mu_progress'] = '@PCT@% transferido'; -$lang['mu_filetypes'] = 'Tipos de Ficheiros Permitidos'; -$lang['mu_info'] = 'Ficheiros carregados.'; -$lang['mu_lasterr'] = 'Último erro:'; $lang['recent_global'] = 'Você está a observar as alterações dentro do espaço de nomes %s. Também é possível ver as modificações recentes no wiki inteiro.'; $lang['years'] = '%d anos atrás'; $lang['months'] = '%d meses atrás'; diff --git a/inc/lang/ro/lang.php b/inc/lang/ro/lang.php index 91f8ebb97..0275b30f3 100644 --- a/inc/lang/ro/lang.php +++ b/inc/lang/ro/lang.php @@ -280,21 +280,6 @@ $lang['i_pol1'] = 'Wiki Deschisă (citeste oricine, scrie şi în $lang['i_pol2'] = 'Wiki Închisă (citeşte, scrie şi încarcă doar utilizatorul înregistrat)'; $lang['i_retry'] = 'Încearcă din nou'; $lang['i_license'] = 'Vă rugăm alegeţi licenţa sub care doriţi să vă licenţiaţi materialul:'; -$lang['mu_intro'] = 'Aici poţi încărca mai multe fişiere simultan. Apasă butonul Răsfoieşte pentru a le adăuga. Apasă Încarcă când ai terminat.'; -$lang['mu_gridname'] = 'Numele fişierului'; -$lang['mu_gridsize'] = 'Mărime'; -$lang['mu_gridstat'] = 'Stare'; -$lang['mu_namespace'] = 'Spaţiu de nume'; -$lang['mu_browse'] = 'Răsfoieşte'; -$lang['mu_toobig'] = 'prea mare'; -$lang['mu_ready'] = 'pregătit pentru încărcare'; -$lang['mu_done'] = 'complet'; -$lang['mu_fail'] = 'eşuat'; -$lang['mu_authfail'] = 'sesiunea a expirat'; -$lang['mu_progress'] = '@PCT@% încărcat'; -$lang['mu_filetypes'] = 'Tipuri de fişiere permise'; -$lang['mu_info'] = 'fişiere încărcate'; -$lang['mu_lasterr'] = 'Ultima eroare:'; $lang['recent_global'] = 'Acum vizualizaţi modificările în interiorul numelui de spaţiu %s. De asemenea puteţi vizualiza modificările recente ale întregului wiki.'; $lang['years'] = 'acum %d ani'; $lang['months'] = 'acum %d luni'; diff --git a/inc/lang/ru/lang.php b/inc/lang/ru/lang.php index eda838451..10fca5477 100644 --- a/inc/lang/ru/lang.php +++ b/inc/lang/ru/lang.php @@ -315,22 +315,6 @@ $lang['i_pol2'] = 'Закрытая вики (чтение, за $lang['i_retry'] = 'Повторить попытку'; $lang['i_license'] = 'Пожалуйста, выберите тип лицензии для своей вики:'; -$lang['mu_intro'] = 'Здесь вы можете загрузить несколько файлов сразу. Кликните на «обзор», чтобы добавить их в список. Нажмите «загрузить», когда будете готовы.'; -$lang['mu_gridname'] = 'Имя файла'; -$lang['mu_gridsize'] = 'Размер'; -$lang['mu_gridstat'] = 'Статус'; -$lang['mu_namespace'] = 'Пространство имён'; -$lang['mu_browse'] = 'Обзор'; -$lang['mu_toobig'] = 'слишком большой'; -$lang['mu_ready'] = 'готово к загрузке'; -$lang['mu_done'] = 'завершено'; -$lang['mu_fail'] = 'провалено'; -$lang['mu_authfail'] = 'истекло время сессии'; -$lang['mu_progress'] = '@PCT@% загружено'; -$lang['mu_filetypes'] = 'Допустимые типы файлов'; -$lang['mu_info'] = 'файлов загружено.'; -$lang['mu_lasterr'] = 'Последняя ошибка:'; - $lang['recent_global'] = 'Вы просматриваете изменения в пространстве имён %s. Вы можете также просмотреть недавние изменения во всей вики.'; $lang['years'] = '%d лет назад'; $lang['months'] = '%d месяц(ев) назад'; diff --git a/inc/lang/sk/lang.php b/inc/lang/sk/lang.php index c0d45da58..a14024191 100644 --- a/inc/lang/sk/lang.php +++ b/inc/lang/sk/lang.php @@ -278,21 +278,6 @@ $lang['i_pol1'] = 'Verejná Wiki (čítanie pre každého, zápis $lang['i_pol2'] = 'Uzatvorená Wiki (čítanie, zápis a nahrávanie len pre registrovaných užívateľov)'; $lang['i_retry'] = 'Skúsiť znovu'; $lang['i_license'] = 'Vyberte licenciu, pod ktorou chcete uložiť váš obsah:'; -$lang['mu_intro'] = 'Na tomto mieste môžete nahrávať viac súborov súčasne. Tlačidlom Prehľadávať pridáte súbory do zoznamu. Tlačidlom Nahrať vykonáte prenos súborov.'; -$lang['mu_gridname'] = 'Názov súboru'; -$lang['mu_gridsize'] = 'Veľkosť'; -$lang['mu_gridstat'] = 'Status'; -$lang['mu_namespace'] = 'Menný priestor'; -$lang['mu_browse'] = 'Prehľadávať'; -$lang['mu_toobig'] = 'príliš veľký'; -$lang['mu_ready'] = 'pripravený na nahratie'; -$lang['mu_done'] = 'dokončený'; -$lang['mu_fail'] = 'neúspešný'; -$lang['mu_authfail'] = 'spojenie stratilo platnosť'; -$lang['mu_progress'] = '@PCT@% nahraných'; -$lang['mu_filetypes'] = 'Povolené typy súborov'; -$lang['mu_info'] = 'nahraných súborov.'; -$lang['mu_lasterr'] = 'Posledná chyba:'; $lang['recent_global'] = 'Práve prehliadate zmeny v mennom priestore %s. Môžete si tiež pozrieť aktuálne zmeny celej wiki.'; $lang['years'] = 'pred %d rokmi'; $lang['months'] = 'pred %d mesiacmi'; diff --git a/inc/lang/sl/lang.php b/inc/lang/sl/lang.php index 9acf13504..d802aa8f0 100644 --- a/inc/lang/sl/lang.php +++ b/inc/lang/sl/lang.php @@ -254,21 +254,6 @@ $lang['i_pol1'] = 'Javni Wiki (branje za vse, zapis in nalaganje $lang['i_pol2'] = 'Zaprt Wiki (berejo in urejajo lahko le prijavljeni uporabniki)'; $lang['i_retry'] = 'Ponovni poskus'; $lang['i_license'] = 'Izbor dovoljenja objave vsebine:'; -$lang['mu_intro'] = 'Naložiti je mogoče več datotek hkrati. S klikom na gumb "Prebrskaj", jih je mogoče dodati v vrsto. S klikom na povezavo "naloži" bodo datoteke poslane na strežnik.'; -$lang['mu_gridname'] = 'Ime datoteke'; -$lang['mu_gridsize'] = 'Velikost'; -$lang['mu_gridstat'] = 'Stanje'; -$lang['mu_namespace'] = 'Imenski prostor'; -$lang['mu_browse'] = 'Prebrskaj'; -$lang['mu_toobig'] = 'prevelika datoteka'; -$lang['mu_ready'] = 'pripravljena na pošiljanje'; -$lang['mu_done'] = 'končano'; -$lang['mu_fail'] = 'ni uspelo'; -$lang['mu_authfail'] = 'seja je potekla'; -$lang['mu_progress'] = '@PCT@% je poslano'; -$lang['mu_filetypes'] = 'Dovoljene vrste datotek'; -$lang['mu_info'] = 'poslanih datotek.'; -$lang['mu_lasterr'] = 'Zadnja napaka:'; $lang['recent_global'] = 'Trenutno so prikazane spremembe znotraj imenskega prostora %s. Mogoče si je ogledati tudi spremembe celotnega sistema Wiki.'; $lang['years'] = '%d let nazaj'; $lang['months'] = '%d mesecev nazaj'; diff --git a/inc/lang/sq/lang.php b/inc/lang/sq/lang.php index 87d0f30b5..569256b52 100644 --- a/inc/lang/sq/lang.php +++ b/inc/lang/sq/lang.php @@ -232,21 +232,6 @@ $lang['i_pol0'] = 'Wiki i Hapur (lexim, shkrim, ngarkim për këd $lang['i_pol1'] = 'Wiki Publike (lexim për këdo, shkrim dhe ngarkim për përdoruesit e regjistruar)'; $lang['i_pol2'] = 'Wiki e Mbyllur (lexim, shkrim, ngarkim vetëm për përdoruesit e regjistruar)'; $lang['i_retry'] = 'Provo Përsëri'; -$lang['mu_intro'] = 'Këtu mund të ngarkoni disa skedarë njëkohësisht. Klikoni butonin e shfletuesit për t\'i shtuar ata në radhë. Klikoni Ngarko kur të keni mbaruar.'; -$lang['mu_gridname'] = 'Emri Skedari'; -$lang['mu_gridsize'] = 'Madhësia'; -$lang['mu_gridstat'] = 'Statusi'; -$lang['mu_namespace'] = 'Hapësira Emrit'; -$lang['mu_browse'] = 'Shfleto'; -$lang['mu_toobig'] = 'shumë i/e madhe'; -$lang['mu_ready'] = 'gati për ngarkim'; -$lang['mu_done'] = 'përfundoi'; -$lang['mu_fail'] = 'dështoi'; -$lang['mu_authfail'] = 'sesioni skadoi'; -$lang['mu_progress'] = '@PCT@% u ngarkua'; -$lang['mu_filetypes'] = 'Tipet e Skedarëve të Lejuar'; -$lang['mu_info'] = 'skedarët e ngarkuar'; -$lang['mu_lasterr'] = 'Gabimi i fundit:'; $lang['recent_global'] = 'Momentalisht jeni duke parë ndryshimet brenda hapësirës së emrit %s. Gjithashtu mund të shihni ndryshimet më të fundit në të gjithë wiki-n.'; $lang['years'] = '%d vite më parë'; $lang['months'] = '%d muaj më parë'; diff --git a/inc/lang/sr/lang.php b/inc/lang/sr/lang.php index 22bcf4e33..3b2d2939c 100644 --- a/inc/lang/sr/lang.php +++ b/inc/lang/sr/lang.php @@ -254,21 +254,6 @@ $lang['i_pol1'] = 'Јавни вики (читање за све, $lang['i_pol2'] = 'Затворени вики (читање, писање и слање датотека само за регистроване кориснике)'; $lang['i_retry'] = 'Понови'; $lang['i_license'] = 'Молимо вас, одаберите лиценцу под коју желите да ставите свој садржај:'; -$lang['mu_intro'] = 'Одавде можете послати више датотека одједном. Кликните на дугме Тражи да бисте додали датотеке на листу. Када завршите са одабирањем кликните на Пошаљи.'; -$lang['mu_gridname'] = 'Назив датотеке'; -$lang['mu_gridsize'] = 'Величина'; -$lang['mu_gridstat'] = 'Статус'; -$lang['mu_namespace'] = 'Именски простор'; -$lang['mu_browse'] = 'Тражи'; -$lang['mu_toobig'] = 'превелико'; -$lang['mu_ready'] = 'спремно за слање'; -$lang['mu_done'] = 'завршено'; -$lang['mu_fail'] = 'није успело'; -$lang['mu_authfail'] = 'сесија је истекла'; -$lang['mu_progress'] = '@PCT@% послато'; -$lang['mu_filetypes'] = 'Дозвољени типови датотека'; -$lang['mu_info'] = 'Фајлови послати'; -$lang['mu_lasterr'] = 'Последња грешка:'; $lang['recent_global'] = 'Тренутно пратите промене у именском простору %s. Такође, можете пратити прмене на целом викију.'; $lang['years'] = 'Пре %d година'; $lang['months'] = 'Пре %d месеци'; diff --git a/inc/lang/sv/lang.php b/inc/lang/sv/lang.php index 943509fed..8601829d2 100644 --- a/inc/lang/sv/lang.php +++ b/inc/lang/sv/lang.php @@ -256,21 +256,6 @@ $lang['i_pol0'] = 'Öppen wiki (alla får läsa, skriva och ladda $lang['i_pol1'] = 'Publik wiki (alla får läsa, registrerade användare för skriva och ladda upp filer)'; $lang['i_pol2'] = 'Sluten wiki (endast registrerade användare får läsa, skriva och ladda upp filer)'; $lang['i_retry'] = 'Försök igen'; -$lang['mu_intro'] = 'Här kan du ladda upp flera filer på en gång. Klicka på bläddra-knappen för att lägga till dem i kön. Tryck på ladda upp när du är klar.'; -$lang['mu_gridname'] = 'Filnamn'; -$lang['mu_gridsize'] = 'Storlek'; -$lang['mu_gridstat'] = 'Status'; -$lang['mu_namespace'] = 'Namnrymd'; -$lang['mu_browse'] = 'Bläddra'; -$lang['mu_toobig'] = 'för stor'; -$lang['mu_ready'] = 'redo att ladda upp'; -$lang['mu_done'] = 'komplett'; -$lang['mu_fail'] = 'misslyckades'; -$lang['mu_authfail'] = 'sessionen över tid'; -$lang['mu_progress'] = '@PCT@% uppladdade'; -$lang['mu_filetypes'] = 'Tillåtna filtyper'; -$lang['mu_info'] = 'filerna uppladdade.'; -$lang['mu_lasterr'] = 'Senaste fel:'; $lang['recent_global'] = 'Du bevakar ändringar i namnrymden %s. Du kan också titta på senaste ändringar för hela wikin.'; $lang['years'] = '%d år sedan'; $lang['months'] = '%d månader sedan'; diff --git a/inc/lang/th/lang.php b/inc/lang/th/lang.php index 0d0613961..4ac6d7247 100644 --- a/inc/lang/th/lang.php +++ b/inc/lang/th/lang.php @@ -221,21 +221,6 @@ $lang['i_pol0'] = 'วิกิเปิดกว้าง (ใ $lang['i_pol1'] = 'วิกิสาธารณะ (ทุกคนอ่านได้, เขียน และ อัพโหลดเฉพาะผู้ใช้ที่ลงทะเบียนแล้ว)'; $lang['i_pol2'] = 'วิกิภายใน (อ่าน, เขียน, อัพโหลด สำหรับผู้ใช้ที่ลงทะเบียนแล้วเท่านั้น)'; $lang['i_retry'] = 'ลองใหม่'; -$lang['mu_intro'] = 'ที่นี่คุณสามารถอัพโหลดหลายๆไฟล์ได้พร้อมๆกัน คลิ๊กปุ่มบราวซ์เพื่อเพิ่มมันเข้าไปในคิว กดปุ่มอัพโหลดเมื่อเสร็จแล้ว'; -$lang['mu_gridname'] = 'ชื่อไฟล์'; -$lang['mu_gridsize'] = 'ขนาด'; -$lang['mu_gridstat'] = 'สถานะ'; -$lang['mu_namespace'] = 'เนมสเปซ'; -$lang['mu_browse'] = 'เรียกดู'; -$lang['mu_toobig'] = 'ใหญ่ไป'; -$lang['mu_ready'] = 'พร้อมอัปโหลด'; -$lang['mu_done'] = 'เสร็จสิ้น'; -$lang['mu_fail'] = 'ล้มเหลว'; -$lang['mu_authfail'] = 'วาระหมดอายุ'; -$lang['mu_progress'] = '@PCT@% อัปโหลดแล้ว'; -$lang['mu_filetypes'] = 'ชนิดแฟ้มที่อนุญาต'; -$lang['mu_info'] = 'แฟ้มอัปโหลดแล้ว'; -$lang['mu_lasterr'] = 'ผิดพลาดล่าสุด:'; $lang['years'] = '%d ปีก่อน'; $lang['months'] = '%d เดือนก่อน'; $lang['weeks'] = '%d สัปดาห์ก่อน'; diff --git a/inc/lang/tr/lang.php b/inc/lang/tr/lang.php index 94b1c951a..cbadde849 100644 --- a/inc/lang/tr/lang.php +++ b/inc/lang/tr/lang.php @@ -234,17 +234,4 @@ $lang['i_pol0'] = 'Tamamen Açık Wiki (herkes okuyabilir, yazabi $lang['i_pol1'] = 'Açık Wiki (herkes okuyabilir, ancak sadece üye olanlar yazabilir ve dosya yükleyebilir)'; $lang['i_pol2'] = 'Kapalı Wiki (sadece üye olanlar okuyabilir, yazabilir ve dosya yükleyebilir)'; $lang['i_retry'] = 'Tekrar Dene'; -$lang['mu_intro'] = 'Burada birden fazla dosyayı bir seferde yükleyebilirsiniz. Sıraya eklemek için Gözat butonuna tıklayın. Bitince yükleye tıklayın'; -$lang['mu_gridname'] = 'Dosya Adı'; -$lang['mu_gridsize'] = 'Boyutu'; -$lang['mu_gridstat'] = 'Durumu'; -$lang['mu_namespace'] = 'Namespace'; -$lang['mu_browse'] = 'Gözat'; -$lang['mu_toobig'] = 'çok büyük'; -$lang['mu_ready'] = 'yüklenmeye hazır'; -$lang['mu_done'] = 'tamamlandı'; -$lang['mu_fail'] = 'başarısız'; -$lang['mu_authfail'] = 'oturum zaman aşımına uğradı'; -$lang['mu_progress'] = '@PCT@% yüklendi'; -$lang['mu_filetypes'] = 'İzin verilen Dosya Türleri'; $lang['recent_global'] = '%s namespace\'i içerisinde yapılan değişiklikleri görüntülemektesiniz. Wiki\'deki tüm değişiklikleri de bu adresten görebilirsiniz. '; diff --git a/inc/lang/uk/lang.php b/inc/lang/uk/lang.php index 22d61c9bf..18bee589d 100644 --- a/inc/lang/uk/lang.php +++ b/inc/lang/uk/lang.php @@ -263,21 +263,6 @@ $lang['i_pol1'] = 'Публічна Вікі (читання дл $lang['i_pol2'] = 'Закрита Вікі (читання, запис та завантаження тільки для зареєстрованих користувачів)'; $lang['i_retry'] = 'Повторити'; $lang['i_license'] = 'Будь ласка, виберіть тип ліцензії, під якою Ві бажаєте опублікувати матеріал:'; -$lang['mu_intro'] = 'Тут ви можете завантажити одночасно кілька файлів. Натисніть кнопку "Вибрати", щоб додати файли в чергу. Після закінчення натисніть кнопку "Завантажити"'; -$lang['mu_gridname'] = 'Ім’я файлу'; -$lang['mu_gridsize'] = 'Розмір'; -$lang['mu_gridstat'] = 'Статус'; -$lang['mu_namespace'] = 'Простір імен'; -$lang['mu_browse'] = 'Вибрати'; -$lang['mu_toobig'] = 'надто великий'; -$lang['mu_ready'] = 'готовий до завантаження'; -$lang['mu_done'] = 'закінчено'; -$lang['mu_fail'] = 'невдале'; -$lang['mu_authfail'] = 'закінчено термін дії сесії'; -$lang['mu_progress'] = 'Завантаження @PCT@%'; -$lang['mu_filetypes'] = 'Дозволені типи файлів'; -$lang['mu_info'] = 'Файли завантажено'; -$lang['mu_lasterr'] = 'Остання помилка:'; $lang['recent_global'] = 'Ви переглядаєте зміни в межах простору імен %s. Також можна переглянути зміни в межах усієї Вікі.'; $lang['years'] = '%d років тому'; $lang['months'] = '%d місяців тому'; diff --git a/inc/lang/zh-tw/lang.php b/inc/lang/zh-tw/lang.php index a144767f4..3a126105b 100644 --- a/inc/lang/zh-tw/lang.php +++ b/inc/lang/zh-tw/lang.php @@ -282,21 +282,6 @@ $lang['i_pol1'] = '公開的維基 (任何人可讀取，註冊 $lang['i_pol2'] = '封閉的維基 (只有註冊使用者可讀取、寫入、上傳)'; $lang['i_retry'] = '重試'; $lang['i_license'] = '請選擇您想要的內容發布許可協議：'; -$lang['mu_intro'] = '您可以在這裡一次上傳多個檔案。按下瀏覽按鈕加入檔案，然後按上傳按鈕開始上傳。'; -$lang['mu_gridname'] = '檔案名稱'; -$lang['mu_gridsize'] = '檔案大小'; -$lang['mu_gridstat'] = '狀態'; -$lang['mu_namespace'] = '命名空間'; -$lang['mu_browse'] = '瀏覽'; -$lang['mu_toobig'] = '太大'; -$lang['mu_ready'] = '準備上傳'; -$lang['mu_done'] = '完成'; -$lang['mu_fail'] = '失敗'; -$lang['mu_authfail'] = '作業階段逾時'; -$lang['mu_progress'] = '@PCT@% 已上傳'; -$lang['mu_filetypes'] = '接受的檔案類型'; -$lang['mu_info'] = '檔案已上傳。'; -$lang['mu_lasterr'] = '最新一筆錯誤紀錄：'; $lang['recent_global'] = '您正在閱讀命名空間： %s 中的變更。您亦可觀看整個維基的最近更新。'; $lang['years'] = '%d 年前'; $lang['months'] = '%d 個月前'; diff --git a/inc/lang/zh/lang.php b/inc/lang/zh/lang.php index 95d1bc2c5..8fffc5ed2 100644 --- a/inc/lang/zh/lang.php +++ b/inc/lang/zh/lang.php @@ -290,21 +290,7 @@ $lang['i_pol1'] = '公共的维基（任何人都有读的权限 $lang['i_pol2'] = '关闭的维基（只有注册用户才有读、写、上传的权限）'; $lang['i_retry'] = '重试'; $lang['i_license'] = '请选择您希望的内容发布许可协议：'; -$lang['mu_intro'] = '您可以在此一次上传多个文件。点按浏览按钮添加文件到上传队列中，先好后按上传钮。'; -$lang['mu_gridname'] = '文件名'; -$lang['mu_gridsize'] = '大小'; -$lang['mu_gridstat'] = '状态'; -$lang['mu_namespace'] = '名称空间'; -$lang['mu_browse'] = '浏览'; -$lang['mu_toobig'] = '过大'; -$lang['mu_ready'] = '准备好上传'; -$lang['mu_done'] = '完成'; -$lang['mu_fail'] = '失败'; -$lang['mu_authfail'] = '会话过期'; -$lang['mu_progress'] = '@PCT@% 上传完成'; -$lang['mu_filetypes'] = '允许的文件类型'; -$lang['mu_info'] = '文件已上传。'; -$lang['mu_lasterr'] = '最后一个错误：'; + $lang['recent_global'] = '您当前看到的是%s 名称空间的变动。你还可以在查看整个维基的近期变动。'; $lang['years'] = '%d年前'; $lang['months'] = '%d月前'; -- cgit v1.2.3 From e3b5f536dca655d5373e5ec24b258a359f22876d Mon Sep 17 00:00:00 2001 From: Martin Michalek Date: Fri, 13 Jan 2012 21:38:26 +0100 Subject: Slovak language update --- inc/lang/sk/lang.php | 8 ++++---- lib/plugins/config/lang/sk/lang.php | 1 + 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/inc/lang/sk/lang.php b/inc/lang/sk/lang.php index c0d45da58..a70cf0400 100644 --- a/inc/lang/sk/lang.php +++ b/inc/lang/sk/lang.php @@ -38,7 +38,7 @@ $lang['btn_update'] = 'Aktualizovať'; $lang['btn_delete'] = 'Zmazať'; $lang['btn_back'] = 'Späť'; $lang['btn_backlink'] = 'Spätné odkazy'; -$lang['btn_backtomedia'] = 'Späť na výber média'; +$lang['btn_backtomedia'] = 'Späť na výber súboru'; $lang['btn_subscribe'] = 'Sledovať zmeny'; $lang['btn_profile'] = 'Aktualizovať profil'; $lang['btn_reset'] = 'Zrušiť'; @@ -139,8 +139,8 @@ $lang['js']['media_cancel'] = 'odstrániť'; $lang['js']['media_overwrt'] = 'Prepísať existujúce súbory'; $lang['rssfailed'] = 'Nastala chyba pri vytváraní tohto RSS: '; $lang['nothingfound'] = 'Nič nenájdené.'; -$lang['mediaselect'] = 'Výber dokumentu'; -$lang['fileupload'] = 'Nahrávanie dokumentu'; +$lang['mediaselect'] = 'Výber súboru'; +$lang['fileupload'] = 'Nahrávanie súboru'; $lang['uploadsucc'] = 'Prenos prebehol v poriadku'; $lang['uploadfail'] = 'Chyba pri nahrávaní. Možno kvôli zle nastaveným právam?'; $lang['uploadwrong'] = 'Prenos súboru s takouto príponou nie je dovolený.'; @@ -193,7 +193,7 @@ $lang['mail_new_user'] = 'nový užívateľ:'; $lang['mail_upload'] = 'nahraný súbor:'; $lang['changes_type'] = 'Prehľad zmien'; $lang['pages_changes'] = 'Stránok'; -$lang['media_changes'] = 'Média súborov'; +$lang['media_changes'] = 'Súbory'; $lang['both_changes'] = 'Stránok spolu s média súbormi'; $lang['qb_bold'] = 'Tučné'; $lang['qb_italic'] = 'Kurzíva'; diff --git a/lib/plugins/config/lang/sk/lang.php b/lib/plugins/config/lang/sk/lang.php index 72ce10775..9f55248a3 100644 --- a/lib/plugins/config/lang/sk/lang.php +++ b/lib/plugins/config/lang/sk/lang.php @@ -64,6 +64,7 @@ $lang['useheading'] = 'Použiť nadpis pre názov stránky'; $lang['refcheck'] = 'Kontrolovať odkazy na médiá (pred vymazaním)'; $lang['refshow'] = 'Počet zobrazených odkazov na médiá'; $lang['allowdebug'] = 'Povoliť ladenie chýb deaktivujte, ak nie je potrebné!'; +$lang['mediarevisions'] = 'Povoliť verzie súborov?'; $lang['usewordblock'] = 'Blokovať spam na základe zoznamu známych slov'; $lang['indexdelay'] = 'Časové oneskorenie pred indexovaním (sek)'; $lang['relnofollow'] = 'Používať rel="nofollow" pre externé odkazy'; -- cgit v1.2.3 From 49cf8ed6b5276f1f52c9b7b3766aebab68e043a9 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Sat, 14 Jan 2012 10:36:26 +0000 Subject: moved back to top target higher up (fixes #21) --- main.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/main.php b/main.php index e5552215d..56d7ac90f 100755 --- a/main.php +++ b/main.php @@ -31,10 +31,12 @@ $showSidebar = tpl_getConf('sidebarID') && page_exists(tpl_getConf('sidebarID')) precede CSS rules by #IE6 for IE6, #IE7 for IE7 and #IE8 for IE8 (div closes at the bottom) */ ?> + are added to make it possible to e.g. style a page differently if it's in edit mode, see http://www.dokuwiki.org/devel:action_modes for a list of action modes */ ?> -
    +
    @@ -45,7 +47,7 @@ $showSidebar = tpl_getConf('sidebarID') && page_exists(tpl_getConf('sidebarID'))

    '.$conf['title'].'', - 'id="dokuwiki__top" accesskey="h" title="[H]"' + 'accesskey="h" title="[H]"' ) /* @todo: obviously don't use tpl_getFavicon, but make a new function (or use a config option?) */ ?>

    -- cgit v1.2.3 From 549bb6e66ff58c6276e77d31f32fcee8b60b41b3 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Sat, 14 Jan 2012 11:37:22 +0000 Subject: rough styling of headings (#9) --- css/basic.css | 41 +++++++++++++++++++++++++++++++---------- css/design.css | 10 +++------- 2 files changed, 34 insertions(+), 17 deletions(-) diff --git a/css/basic.css b/css/basic.css index 793f5cca0..c3ea29ebe 100755 --- a/css/basic.css +++ b/css/basic.css @@ -37,8 +37,7 @@ body { h1, h2, h3, h4, h5, h6, caption, legend { font-family: Arial, sans-serif; - font-weight: normal; - color: #000;/* @todo: style.ini */ + font-weight: bold; background-color: inherit; padding: 0; line-height: 1.2; @@ -47,17 +46,39 @@ caption, legend { h1 { font-size: 2em; - margin: 0 0 0.444em; - letter-spacing: -0.035em; - /*2 lines below makes ascenders of h1 be at the top of block*/ + margin: -.222em 0 0.444em; + /*2 lines below makes ascenders of h1 be at the top of block line-height: 0.75; padding-bottom: 0.3em; + letter-spacing: -0.035em; + margin: 0 0 0.444em; + */ +} +h2 { + font-size: 1.5em; + margin: 0 0 0.666em; + /* + border-bottom: 1px dashed #888; + margin: 0 0 .444em -1px; + padding: 0 0 .222em 1px; + */ +} +h3 { + font-size: 1.125em; + margin: 0 0 0.888em; +} +h4 { + font-size: 1em; + margin: 0 0 1.0em; +} +h5 { + font-size: .875em; + margin: 0 0 1.1428em; +} +h6 { + font-size: .75em; + margin: 0 0 1.333em; } -h2 { font-size: 1.5em; margin: 0 0 0.666em; } -h3 { font-size: 1.125em; margin: 0 0 0.888em; } -h4 { font-size: 1em; margin: 0 0 1.0em; } -h5 { font-size: .875em; margin: 0 0 1.1428em; } -h6 { font-size: .75em; margin: 0 0 1.333em; } /* bottom margin = 1 / font-size */ diff --git a/css/design.css b/css/design.css index d32bc711b..47b5990b0 100755 --- a/css/design.css +++ b/css/design.css @@ -28,16 +28,13 @@ padding-top: 10px; } #dokuwiki__header h1 { - margin-bottom: 0; + margin: 0; font-size: 1.5em; - /* - text-shadow: 1px 1px 0px #fff; - */ + font-weight: normal; } #dokuwiki__header h1 a { text-decoration: none; - /* @todo: style.ini */ - color: #000; + color: __text__; background-color: inherit; } #dokuwiki__header h1 a:hover, @@ -46,7 +43,6 @@ } #dokuwiki__header p.claim { margin-bottom: 0; - /*color: __text_neu__;*/ font-size: 0.875em; } -- cgit v1.2.3 From 02a27354539bd0c9e3fffb80909816632baad38f Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Sat, 14 Jan 2012 11:38:51 +0000 Subject: fixed pre wrapping (bug introduced in 5a94948e) --- css/basic.css | 1 + 1 file changed, 1 insertion(+) diff --git a/css/basic.css b/css/basic.css index c3ea29ebe..ecb05ba82 100755 --- a/css/basic.css +++ b/css/basic.css @@ -218,6 +218,7 @@ pre, code, samp, kbd { } pre { overflow: auto; + word-wrap: normal; } blockquote { -- cgit v1.2.3 From 678d9bed2b6a97dfce2e7c5e8edaec9b82b50a47 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Sat, 14 Jan 2012 11:54:19 +0000 Subject: minor typography changes for sidebar --- css/design.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/css/design.css b/css/design.css index 47b5990b0..6ee93c9d3 100755 --- a/css/design.css +++ b/css/design.css @@ -361,7 +361,6 @@ #dokuwiki__aside { } #dokuwiki__aside .pad { - line-height: 1.2; font-size: 0.875em; overflow: hidden; word-wrap: break-word; @@ -369,7 +368,8 @@ /* make sidebar more condensed */ -#dokuwiki__aside h1 { margin-bottom: .222em; } +/* make h1 in sidebar ugly and small to prevent people using it */ +#dokuwiki__aside h1 { font-size: .7em; color: green; background-color: pink; } #dokuwiki__aside h2 { margin-bottom: .333em; } #dokuwiki__aside h3 { margin-bottom: .444em; } #dokuwiki__aside h4 { margin-bottom: .5em; } -- cgit v1.2.3 From 36daf5ca2191ae6ab635f3c9ff166d7c34df2dfc Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Sat, 14 Jan 2012 13:26:43 +0000 Subject: avoid wrapping of toolbar (fixes #16) --- css/_edit.css | 2 ++ css/design.css | 5 +++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/css/_edit.css b/css/_edit.css index 88ebcf15c..67f83c278 100755 --- a/css/_edit.css +++ b/css/_edit.css @@ -10,6 +10,7 @@ .dokuwiki div.toolbar { margin-bottom: .5em; + overflow: hidden; } .dokuwiki div.toolbar #draft__status { float: right; @@ -17,6 +18,7 @@ background-color: inherit; } .dokuwiki div.toolbar #tool__bar { + float: left; } /* buttons inside of toolbar */ diff --git a/css/design.css b/css/design.css index 6ee93c9d3..384e837bf 100755 --- a/css/design.css +++ b/css/design.css @@ -453,14 +453,15 @@ .dokuwiki div.toolbar button.toolbutton { border-radius: 0; - border-right-width: 0; + border-left-width: 0; + padding: .1em .35em; } .dokuwiki div.toolbar button.toolbutton:first-child { border-top-left-radius: 4px; border-bottom-left-radius: 4px; + border-left-width: 1px; } .dokuwiki div.toolbar button.toolbutton:last-child { - border-right-width: 1px; border-top-right-radius: 4px; border-bottom-right-radius: 4px; } -- cgit v1.2.3 From 2fdce5a857b84dbe7b27ac14fade66c47611e95b Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Sat, 14 Jan 2012 13:57:36 +0000 Subject: improved size of char picker (#20), but might not be enough --- css/design.css | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/css/design.css b/css/design.css index 384e837bf..cc0ea0d28 100755 --- a/css/design.css +++ b/css/design.css @@ -466,6 +466,12 @@ border-bottom-right-radius: 4px; } +div.picker button.pickerbutton, +div.picker button.toolbutton { + padding: .1em .35em; + border-width: 0; +} + .dokuwiki textarea.edit { font-family: Consolas, "Andale Mono WT", "Andale Mono", "Bitstream Vera Sans Mono", "Liberation Mono", Monaco, "Courier New", monospace; } -- cgit v1.2.3 From a02cb3bf2dcbf12744044062b24fca531bd4f999 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Sat, 14 Jan 2012 14:42:47 +0000 Subject: improved section highlighting --- css/_edit.css | 10 ++++++++-- css/design.css | 5 +++++ style.ini | 6 +++--- 3 files changed, 16 insertions(+), 5 deletions(-) diff --git a/css/_edit.css b/css/_edit.css index 67f83c278..67f076914 100755 --- a/css/_edit.css +++ b/css/_edit.css @@ -111,7 +111,13 @@ div.picker button.pickerbutton { .dokuwiki .secedit input.button { font-size: 75%; } + +/* generic style for section highlighting (including headings) */ .dokuwiki .section_highlight { - background-color: __background_alt__ !important; - color: inherit; +} +/* style for section highlighting (only sections below headings) */ +.dokuwiki div.section_highlight { + margin: -3em 0 -.01em -1.5em; + padding: 3em 0 .01em 1em; + border-left: .5em solid __background_alt__; } diff --git a/css/design.css b/css/design.css index cc0ea0d28..d300e890f 100755 --- a/css/design.css +++ b/css/design.css @@ -472,6 +472,11 @@ div.picker button.toolbutton { border-width: 0; } +.dokuwiki div.section_highlight { + margin-left: -2em; + border-left-width: 1em; +} + .dokuwiki textarea.edit { font-family: Consolas, "Andale Mono WT", "Andale Mono", "Bitstream Vera Sans Mono", "Liberation Mono", Monaco, "Courier New", monospace; } diff --git a/style.ini b/style.ini index 3a9e9dfc2..5e32aaa73 100755 --- a/style.ini +++ b/style.ini @@ -9,9 +9,6 @@ [stylesheets] css/basic.css = screen -css/structure.css = screen -css/design.css = screen -css/content.css = screen css/_imgdetail.css = screen css/_media_popup.css = screen css/_media_fullscreen.css = screen @@ -27,6 +24,9 @@ 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/rtl.css = rtl -- cgit v1.2.3 From fb4f3ef88ee5873cded486ad6c52988a9f2d1bd9 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Sat, 14 Jan 2012 17:18:52 +0000 Subject: styled modal windows (closes #23) --- css/design.css | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/css/design.css b/css/design.css index d300e890f..491c66519 100755 --- a/css/design.css +++ b/css/design.css @@ -77,6 +77,14 @@ list-style: none; display: inline; } +#dokuwiki__header .tools form.search div.ajax_qsearch li { + font-size: 1em; + margin-left: 0; + display: block; + overflow: hidden; + text-overflow: ellipsis; +} + /*____________ user tools ____________*/ @@ -493,8 +501,16 @@ div.picker button.toolbutton { background-color: __background__; color: __text__; border: 1px solid __border__; + box-shadow: .1em .1em .1em __border__; + border-radius: 2px; line-height: 1.2; - padding: 0 .2em; + padding: .3em .5em; + font-size: .9em; +} +.dokuwiki form.search div.ajax_qsearch { + top: -.35em; + font-size: 1em; + text-overflow: ellipsis; } .JSpopup ul, -- cgit v1.2.3 From b61494d9f807a0861107ae378f03bcfb2b532f9d Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Sat, 14 Jan 2012 17:28:12 +0000 Subject: further minor improvement for modal windows (#23) --- css/design.css | 1 - 1 file changed, 1 deletion(-) diff --git a/css/design.css b/css/design.css index 491c66519..fba6572fa 100755 --- a/css/design.css +++ b/css/design.css @@ -503,7 +503,6 @@ div.picker button.toolbutton { border: 1px solid __border__; box-shadow: .1em .1em .1em __border__; border-radius: 2px; - line-height: 1.2; padding: .3em .5em; font-size: .9em; } -- cgit v1.2.3 From 97db95bfee88e5f762c760daec7aee233254a98c Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Sat, 14 Jan 2012 17:29:17 +0000 Subject: improved blockquotes roughly (#13), but might not be enough --- css/basic.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/css/basic.css b/css/basic.css index ecb05ba82..08f498acc 100755 --- a/css/basic.css +++ b/css/basic.css @@ -222,7 +222,7 @@ pre { } blockquote { - padding: 0 1.25em; + padding: 0 .5em; border: solid __border__; border-width: 0 0 0 .25em; } -- cgit v1.2.3 From d77336836c77fffcc32660e410a948ee19d74d16 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Sat, 14 Jan 2012 17:50:11 +0000 Subject: made CSS coding style more consistent (pure whitespace changes) --- css/basic.css | 87 +++++++++++++++++++++++++++++++++++++-------------------- css/content.css | 15 +++++++--- css/design.css | 49 +++++++++++++++++++++++--------- 3 files changed, 103 insertions(+), 48 deletions(-) diff --git a/css/basic.css b/css/basic.css index 08f498acc..0165a55ff 100755 --- a/css/basic.css +++ b/css/basic.css @@ -12,7 +12,8 @@ html { overflow-x: auto; overflow-y: scroll; } -html, body { +html, +body { /* @todo: style.ini for #fbfaf9?!? */ background-color: #fbfaf9; color: __text__; @@ -34,8 +35,14 @@ body { /*____________ headers ____________*/ -h1, h2, h3, h4, h5, h6, -caption, legend { +h1, +h2, +h3, +h4, +h5, +h6, +caption, +legend { font-family: Arial, sans-serif; font-weight: bold; background-color: inherit; @@ -84,8 +91,16 @@ h6 { /*____________ basic margins and paddings ____________*/ -p, ul, ol, dl, pre, table, -hr, blockquote, fieldset, address { +p, +ul, +ol, +dl, +pre, +table, +hr, +blockquote, +fieldset, +address { margin: 0 0 1.4em 0; /* bottom margin = line-height */ padding: 0; } @@ -95,16 +110,15 @@ div { padding: 0; } -p, dt, dd, td, th, li { -} - /*____________ lists ____________*/ -ul, ol { +ul, +ol { padding: 0 0 0 1.5em; } -li, dd { +li, +dd { padding: 0; margin: 0 0 0 1.5em; } @@ -114,8 +128,12 @@ dt { padding: 0; } -li ul, li ol, li dl, -dl ul, dl ol, dl dl { +li ul, +li ol, +li dl, +dl ul, +dl ol, +dl dl { margin-bottom: 0; padding: 0; } @@ -146,7 +164,8 @@ caption { margin: 0 0 .3em; } -th, td { +th, +td { padding: .3em .5em; margin: 0; vertical-align: top; @@ -163,19 +182,25 @@ th { a { } -a:link, a:visited { +a:link, +a:visited { text-decoration: none; color: __link__; /* §colour */ } -a:link:hover, a:visited:hover, -a:link:focus, a:visited:focus, -a:link:active, a:visited:active { +a:link:hover, +a:visited:hover, +a:link:focus, +a:visited:focus, +a:link:active, +a:visited:active { text-decoration: underline; } -a:link:focus, a:visited:focus { +a:link:focus, +a:visited:focus { outline: 1px dotted; } -a:link:active, a:visited:active { +a:link:active, +a:visited:active { color: #c00; /* §colour */ } @@ -189,7 +214,8 @@ img { background-color: transparent; font-style: italic; } -img, object { +img, +object { max-width: 100%; } @@ -203,13 +229,17 @@ hr { clear: both; } -acronym, abbr { +acronym, +abbr { cursor: help; border-bottom: 1px dotted; font-style: normal; } -pre, code, samp, kbd { +pre, +code, +samp, +kbd { font-family: Consolas, "Andale Mono WT", "Andale Mono", "Bitstream Vera Sans Mono", "Nimbus Mono L", Monaco, "Courier New", monospace; /* same font stack should be used for ".dokuwiki table.diff td" in _diff.css */ font-size: 1em; @@ -226,11 +256,13 @@ blockquote { border: solid __border__; border-width: 0 0 0 .25em; } -q:before, q:after { +q:before, +q:after { content: ''; } -sub, sup { +sub, +sup { font-size: .8em; line-height: 1; } @@ -329,10 +361,3 @@ button, cursor: pointer; } -/*____________ general classes ____________*/ - -div.clearer { - /* additional to what's already in lib/styles/all.css: */ - font-size: 1px; - visibility: hidden; -} diff --git a/css/content.css b/css/content.css index 376c6f6dd..d908be6b4 100755 --- a/css/content.css +++ b/css/content.css @@ -26,10 +26,17 @@ /*____________ images ____________*/ /* embedded images (styles are already partly set in lib/styles/all.css) */ -.dokuwiki img.media { } -.dokuwiki img.medialeft { margin: .5em 1.5em .5em 0; } -.dokuwiki img.mediaright { margin: .5em 0 .5em 1.5em; } -.dokuwiki img.mediacenter { margin: .5em auto; } +.dokuwiki img.media { +} +.dokuwiki img.medialeft { + margin: .5em 1.5em .5em 0; +} +.dokuwiki img.mediaright { + margin: .5em 0 .5em 1.5em; +} +.dokuwiki img.mediacenter { + margin: .5em auto; +} /*____________ tables ____________*/ diff --git a/css/design.css b/css/design.css index fba6572fa..c3f235674 100755 --- a/css/design.css +++ b/css/design.css @@ -377,22 +377,43 @@ /* make sidebar more condensed */ /* make h1 in sidebar ugly and small to prevent people using it */ -#dokuwiki__aside h1 { font-size: .7em; color: green; background-color: pink; } -#dokuwiki__aside h2 { margin-bottom: .333em; } -#dokuwiki__aside h3 { margin-bottom: .444em; } -#dokuwiki__aside h4 { margin-bottom: .5em; } -#dokuwiki__aside h5 { margin-bottom: .5714em; } - -#dokuwiki__aside p, #dokuwiki__aside ul, #dokuwiki__aside ol, #dokuwiki__aside dl, -#dokuwiki__aside pre, #dokuwiki__aside table, #dokuwiki__aside fieldset, -#dokuwiki__aside hr, #dokuwiki__aside blockquote, #dokuwiki__aside address { +#dokuwiki__aside h1 { + font-size: .7em; + color: green; + background-color: pink; +} +#dokuwiki__aside h2 { + margin-bottom: .333em; +} +#dokuwiki__aside h3 { + margin-bottom: .444em; +} +#dokuwiki__aside h4 { + margin-bottom: .5em; +} +#dokuwiki__aside h5 { + margin-bottom: .5714em; +} + +#dokuwiki__aside p, +#dokuwiki__aside ul, +#dokuwiki__aside ol, +#dokuwiki__aside dl, +#dokuwiki__aside pre, +#dokuwiki__aside table, +#dokuwiki__aside fieldset, +#dokuwiki__aside hr, +#dokuwiki__aside blockquote, +#dokuwiki__aside address { margin-bottom: .7em; } -#dokuwiki__aside ul, #dokuwiki__aside ol { +#dokuwiki__aside ul, +#dokuwiki__aside ol { padding-left: 0; } -#dokuwiki__aside li ul, #dokuwiki__aside li ol { +#dokuwiki__aside li ul, +#dokuwiki__aside li ol { margin-bottom: 0; } @@ -454,8 +475,10 @@ font-size: 100%; } -#IE6 .dokuwiki input.button, #IE6 .dokuwiki button, -#IE7 .dokuwiki input.button, #IE7 .dokuwiki button { +#IE6 .dokuwiki input.button, +#IE6 .dokuwiki button, +#IE7 .dokuwiki input.button, +#IE7 .dokuwiki button { line-height: 1.4; } -- cgit v1.2.3 From ff86e4aeac23747770ba9f8abfec392ea8e4e1e8 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Sat, 14 Jan 2012 17:55:49 +0000 Subject: removed some vendor-specific css prefixes which are supported by all modern browsers now --- css/_media_fullscreen.css | 2 -- css/basic.css | 2 -- 2 files changed, 4 deletions(-) diff --git a/css/_media_fullscreen.css b/css/_media_fullscreen.css index 52c893c8b..7ae17f73b 100644 --- a/css/_media_fullscreen.css +++ b/css/_media_fullscreen.css @@ -443,8 +443,6 @@ } #mediamanager__diff .imageDiff.opacity .image2 { - -moz-opacity: 0.5; - -khtml-opacity: 0.5; opacity: 0.5; } diff --git a/css/basic.css b/css/basic.css index 0165a55ff..0b90fe2b0 100755 --- a/css/basic.css +++ b/css/basic.css @@ -330,8 +330,6 @@ input, textarea, select { border: 1px solid __border__; - -moz-box-shadow: inset 0 0 1px __background_alt__; - -webkit-box-shadow: inset 0 0 1px __background_alt__; box-shadow: inset 0 0 1px __background_alt__; border-radius: 2px; } -- cgit v1.2.3 From d5938d54c63ab2bfc1c4cf294f5404334eb5fcbf Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Sat, 14 Jan 2012 18:00:58 +0000 Subject: removed some IE6-specific styles --- css/design.css | 8 -------- main.php | 4 ++-- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/css/design.css b/css/design.css index c3f235674..75100dc75 100755 --- a/css/design.css +++ b/css/design.css @@ -100,9 +100,6 @@ padding: 0; max-width: __site_width__; } -#IE6 #dokuwiki__usertools ul { - width: 100%; -} #dokuwiki__usertools ul li.user { } @@ -475,8 +472,6 @@ font-size: 100%; } -#IE6 .dokuwiki input.button, -#IE6 .dokuwiki button, #IE7 .dokuwiki input.button, #IE7 .dokuwiki button { line-height: 1.4; @@ -547,9 +542,6 @@ div.picker button.toolbutton { .dokuwiki .wrapper { margin-bottom: 1.4em; } -#IE6 .dokuwiki .wrapper { - margin-bottom: .7em; -} #dokuwiki__footer { margin-bottom: 1em; diff --git a/main.php b/main.php index 56d7ac90f..825fd3cf6 100755 --- a/main.php +++ b/main.php @@ -28,8 +28,8 @@ $showSidebar = tpl_getConf('sidebarID') && page_exists(tpl_getConf('sidebarID')) - + precede CSS rules by #IE7 for IE7 and #IE8 for IE8 (div closes at the bottom) */ ?> + are added to make it possible to e.g. style a page differently if it's in edit mode, -- cgit v1.2.3 From ebace10a78be0db741d715f9103be65031664904 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Sat, 14 Jan 2012 18:15:39 +0000 Subject: removed old designs and todo list --- designs/align_edit_of_page_tools_to_center.png | Bin 230167 -> 0 bytes designs/align_page_tools_to_center.png | Bin 230029 -> 0 bytes designs/align_page_tools_to_content.png | Bin 229747 -> 0 bytes designs/baseline_match_sidebar_approximate.png | Bin 229283 -> 0 bytes designs/blue.jpg | Bin 73564 -> 0 bytes designs/centered.jpg | Bin 80147 -> 0 bytes designs/dark_tools.jpg | Bin 74213 -> 0 bytes designs/edit_highlighting.png | Bin 244935 -> 0 bytes designs/edit_highlighting.psd | Bin 3803290 -> 0 bytes designs/edit_hightlight+toc.png | Bin 232650 -> 0 bytes designs/feedback_splitbrain.png | Bin 83214 -> 0 bytes designs/too_print.jpg | Bin 76596 -> 0 bytes todo.txt | 21 --------------------- 13 files changed, 21 deletions(-) delete mode 100644 designs/align_edit_of_page_tools_to_center.png delete mode 100644 designs/align_page_tools_to_center.png delete mode 100644 designs/align_page_tools_to_content.png delete mode 100644 designs/baseline_match_sidebar_approximate.png delete mode 100644 designs/blue.jpg delete mode 100644 designs/centered.jpg delete mode 100644 designs/dark_tools.jpg delete mode 100644 designs/edit_highlighting.png delete mode 100644 designs/edit_highlighting.psd delete mode 100644 designs/edit_hightlight+toc.png delete mode 100644 designs/feedback_splitbrain.png delete mode 100644 designs/too_print.jpg delete mode 100644 todo.txt diff --git a/designs/align_edit_of_page_tools_to_center.png b/designs/align_edit_of_page_tools_to_center.png deleted file mode 100644 index a1c4a9b25..000000000 Binary files a/designs/align_edit_of_page_tools_to_center.png and /dev/null differ diff --git a/designs/align_page_tools_to_center.png b/designs/align_page_tools_to_center.png deleted file mode 100644 index 3980f7c8b..000000000 Binary files a/designs/align_page_tools_to_center.png and /dev/null differ diff --git a/designs/align_page_tools_to_content.png b/designs/align_page_tools_to_content.png deleted file mode 100644 index 0ba3de2b9..000000000 Binary files a/designs/align_page_tools_to_content.png and /dev/null differ diff --git a/designs/baseline_match_sidebar_approximate.png b/designs/baseline_match_sidebar_approximate.png deleted file mode 100644 index 931ef5482..000000000 Binary files a/designs/baseline_match_sidebar_approximate.png and /dev/null differ diff --git a/designs/blue.jpg b/designs/blue.jpg deleted file mode 100644 index ea210de72..000000000 Binary files a/designs/blue.jpg and /dev/null differ diff --git a/designs/centered.jpg b/designs/centered.jpg deleted file mode 100644 index 465ee97df..000000000 Binary files a/designs/centered.jpg and /dev/null differ diff --git a/designs/dark_tools.jpg b/designs/dark_tools.jpg deleted file mode 100644 index c7c5181a1..000000000 Binary files a/designs/dark_tools.jpg and /dev/null differ diff --git a/designs/edit_highlighting.png b/designs/edit_highlighting.png deleted file mode 100644 index 159efd196..000000000 Binary files a/designs/edit_highlighting.png and /dev/null differ diff --git a/designs/edit_highlighting.psd b/designs/edit_highlighting.psd deleted file mode 100644 index 8cb215d1c..000000000 Binary files a/designs/edit_highlighting.psd and /dev/null differ diff --git a/designs/edit_hightlight+toc.png b/designs/edit_hightlight+toc.png deleted file mode 100644 index 82fb35fda..000000000 Binary files a/designs/edit_hightlight+toc.png and /dev/null differ diff --git a/designs/feedback_splitbrain.png b/designs/feedback_splitbrain.png deleted file mode 100644 index e5f023591..000000000 Binary files a/designs/feedback_splitbrain.png and /dev/null differ diff --git a/designs/too_print.jpg b/designs/too_print.jpg deleted file mode 100644 index 7114286f2..000000000 Binary files a/designs/too_print.jpg and /dev/null differ diff --git a/todo.txt b/todo.txt deleted file mode 100644 index 0439d0da1..000000000 --- a/todo.txt +++ /dev/null @@ -1,21 +0,0 @@ - - -------------- -Look at next: - -icons (start with the usertools? Decide where icons are needed) -footnotes -breadcrumb -trace -check out old default and consider edit-page menu -* TOC looks unstyled, too much indentation -* Too much white/gray space -* remove dashed line under downloadable -* alignment of usertools looks weird -* [[page name]] - - ------------- -Anika todo: - -fix usertools not shrinking to viewport \ No newline at end of file -- cgit v1.2.3 From 0e4bf9aaa85791081e0d27b166e3ec0d20165a71 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Sat, 14 Jan 2012 18:39:23 +0000 Subject: removed 2 and fixed 1 minor todo --- css/basic.css | 1 - css/content.css | 4 ++-- style.ini | 3 --- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/css/basic.css b/css/basic.css index 0b90fe2b0..f8c1b6eaf 100755 --- a/css/basic.css +++ b/css/basic.css @@ -347,7 +347,6 @@ button, /* no style.ini colours on purpose */ color: #333; background-color: #eee; - /* @todo: #ccc on purpose? */ background: -moz-linear-gradient( top, #ffffff 0%, #f4f4f4 30%, #eeeeee 99%, #cccccc 99%); background: -webkit-linear-gradient(top, #ffffff 0%, #f4f4f4 30%, #eeeeee 99%, #cccccc 99%); background: -o-linear-gradient( top, #ffffff 0%, #f4f4f4 30%, #eeeeee 99%, #cccccc 99%); diff --git a/css/content.css b/css/content.css index d908be6b4..03c9221cf 100755 --- a/css/content.css +++ b/css/content.css @@ -110,10 +110,10 @@ .dokuwiki dl.code dt a, .dokuwiki dl.file dt a { background-color: transparent; - /* @todo: those 19px should better be in exe/css.php for all media icons */ - padding: 0.2em 0 0.1em 19px; font-size: 0.875em; font-weight: normal; + display: block; + min-height: 16px; } .dokuwiki dl.code dd, .dokuwiki dl.file dd { diff --git a/style.ini b/style.ini index 5e32aaa73..08d5639a9 100755 --- a/style.ini +++ b/style.ini @@ -65,8 +65,5 @@ __missing__ = "#f30" __highlight__ = "#ff9" ; sidebar width -; @todo: width in em or px? __site_width__ = "72em" -;__site_width__ = "1000px" __sidebar_width__ = "16em" -;__sidebar_width__ = "220px" -- cgit v1.2.3 From b37586f23f52d6d4a81f695721b8ca881cd30a06 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Sat, 14 Jan 2012 20:43:01 +0000 Subject: improved search icon --- css/design.css | 1 + images/search.png | Bin 461 -> 400 bytes 2 files changed, 1 insertion(+) diff --git a/css/design.css b/css/design.css index 75100dc75..2d9c1da9d 100755 --- a/css/design.css +++ b/css/design.css @@ -315,6 +315,7 @@ height: 14px; text-indent: -99999px; margin-left: -20px; + box-shadow: none; } #dokuwiki__sitetools ul { diff --git a/images/search.png b/images/search.png index 25553ce8b..2adfc7357 100644 Binary files a/images/search.png and b/images/search.png differ -- cgit v1.2.3 From 32674f35158de48a04df59e42fdbf57cce2cc321 Mon Sep 17 00:00:00 2001 From: Guy Brand Date: Sun, 15 Jan 2012 10:29:12 +0100 Subject: Remove testing md5 hash from installer --- install.php | 1 - 1 file changed, 1 deletion(-) diff --git a/install.php b/install.php index 457902630..03a026028 100644 --- a/install.php +++ b/install.php @@ -49,7 +49,6 @@ $dokuwiki_hash = array( '2010-11-07' => '7921d48195f4db21b8ead6d9bea801b8', '2011-05-25' => '4241865472edb6fa14a1227721008072', '2011-11-10' => 'b46ff19a7587966ac4df61cbab1b8b31', - 'devel' => '72c083c73608fc43c586901fd5dabb74', ); -- cgit v1.2.3 From 60ed996d2540bffbb8dd890c0a25f36a8dcfe5f8 Mon Sep 17 00:00:00 2001 From: Guy Brand Date: Sun, 15 Jan 2012 10:33:05 +0100 Subject: Update copyright year --- README | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README b/README index 6bb9a3bd9..0490040f2 100644 --- a/README +++ b/README @@ -4,7 +4,7 @@ at http://www.dokuwiki.org/ For Installation Instructions see http://www.dokuwiki.org/install -DokuWiki - 2004-2011 (c) Andreas Gohr +DokuWiki - 2004-2012 (c) Andreas Gohr and the DokuWiki Community See COPYING and file headers for license info -- cgit v1.2.3 From fbb51550eae6c61489f98af3390725e3f690c9c1 Mon Sep 17 00:00:00 2001 From: Guy Brand Date: Sun, 15 Jan 2012 10:43:04 +0100 Subject: Make this dummy file empty like all others --- data/_dummy | 1 - 1 file changed, 1 deletion(-) diff --git a/data/_dummy b/data/_dummy index 37ed18a63..e69de29bb 100644 --- a/data/_dummy +++ b/data/_dummy @@ -1 +0,0 @@ -data directory -- cgit v1.2.3 From 4725165754f92ab9a0e81ee7c69109b0a2f9f35d Mon Sep 17 00:00:00 2001 From: Michael Hamann Date: Sun, 15 Jan 2012 10:55:02 +0100 Subject: Make Sitemapper functions static as they were used as static functions All calls to the Sitemapper were static function calls, this caused notices because they weren't static, with this commit they are marked as static. Furthermore two FIXME comments were removed as dbglog now checks if debugging is enabled. --- inc/Sitemapper.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/inc/Sitemapper.php b/inc/Sitemapper.php index bbe1caf26..4689b04a6 100644 --- a/inc/Sitemapper.php +++ b/inc/Sitemapper.php @@ -25,7 +25,7 @@ class Sitemapper { * @link https://www.google.com/webmasters/sitemaps/docs/en/about.html * @link http://www.sitemaps.org/ */ - public function generate(){ + public static function generate(){ global $conf; if($conf['sitemap'] < 1 || !is_numeric($conf['sitemap'])) return false; @@ -39,11 +39,11 @@ class Sitemapper { if(@filesize($sitemap) && @filemtime($sitemap) > (time()-($conf['sitemap']*86400))){ // 60*60*24=86400 - dbglog('Sitemapper::generate(): Sitemap up to date'); // FIXME: only in debug mode + dbglog('Sitemapper::generate(): Sitemap up to date'); return false; } - dbglog("Sitemapper::generate(): using $sitemap"); // FIXME: Only in debug mode + dbglog("Sitemapper::generate(): using $sitemap"); $pages = idx_get_indexer()->getPages(); dbglog('Sitemapper::generate(): creating sitemap using '.count($pages).' pages'); @@ -77,7 +77,7 @@ class Sitemapper { * @return string The sitemap XML. * @author Michael Hamann */ - private function getXML($items) { + private static function getXML($items) { ob_start(); echo ''.NL; echo ''.NL; @@ -96,7 +96,7 @@ class Sitemapper { * @return The path to the sitemap file. * @author Michael Hamann */ - public function getFilePath() { + public static function getFilePath() { global $conf; $sitemap = $conf['cachedir'].'/sitemap.xml'; @@ -113,7 +113,7 @@ class Sitemapper { * * @author Michael Hamann */ - public function pingSearchEngines() { + public static function pingSearchEngines() { //ping search engines... $http = new DokuHTTPClient(); $http->timeout = 8; -- cgit v1.2.3 From 4fcd684a8a5eb25a7c51dfcb55838fbfc523858f Mon Sep 17 00:00:00 2001 From: Michael Hamann Date: Sun, 15 Jan 2012 11:30:38 +0100 Subject: Disable E_STRICT error reporting This change disables the reporting of strict standard errors in PHP 5.4, in PHP versions prior to 5.4 E_STRICT wasn't part of E_ALL so for these versions this doesn't cause any change (however E_STRICT is available in all versions of PHP 5 so this doesn't cause any problems). See also FS#2427. --- inc/init.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/inc/init.php b/inc/init.php index b3acf2e33..14660b8d0 100644 --- a/inc/init.php +++ b/inc/init.php @@ -30,8 +30,8 @@ if (!defined('DOKU_E_LEVEL') && @file_exists(DOKU_CONF.'report_e_all')) { define('DOKU_E_LEVEL', E_ALL); } if (!defined('DOKU_E_LEVEL')) { - if(defined('E_DEPRECATED')){ // since php 5.3 - error_reporting(E_ALL & ~E_NOTICE & ~E_DEPRECATED); + if(defined('E_DEPRECATED')){ // since php 5.3, since php 5.4 E_STRICT is part of E_ALL + error_reporting(E_ALL & ~E_NOTICE & ~E_DEPRECATED & ~E_STRICT); }else{ error_reporting(E_ALL ^ E_NOTICE); } -- cgit v1.2.3 From 4b5d4e2c364c26d5d04d85e6ea1f6063a75d1765 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Sun, 15 Jan 2012 13:02:45 +0000 Subject: improved buttons (added hover/active/focus styles) and made all form styles independent of style.ini --- css/basic.css | 66 +++++++++++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 51 insertions(+), 15 deletions(-) diff --git a/css/basic.css b/css/basic.css index f8c1b6eaf..3c4ea32bd 100755 --- a/css/basic.css +++ b/css/basic.css @@ -275,6 +275,8 @@ sup { /*____________ forms ____________*/ +/* for all of the form styles, style.ini colours are not used on purpose (except for fieldset border) */ + form { display: inline; margin: 0; @@ -300,23 +302,13 @@ select, optgroup, option { font: inherit; - color: inherit; + color: #333; + background-color: #fff; line-height: 1; margin: 0; vertical-align: middle; } -input::-moz-focus-inner, -button::-moz-focus-inner { - border: 0; - padding: 0; -} -input[disabled], -button[disabled], -input[readonly], -button[readonly] { - cursor: auto; -} optgroup { font-style: italic; font-weight: bold; @@ -329,22 +321,31 @@ option { input, textarea, select { - border: 1px solid __border__; - box-shadow: inset 0 0 1px __background_alt__; + border: 1px solid #ccc; + box-shadow: inset 0 0 1px #eee; border-radius: 2px; } +input:active, +input:focus, +textarea:active, +textarea:focus, +select:active, +select:focus { + border-color: #999; +} input[type=radio], input[type=checkbox] { padding: 0; border-width: 0; + box-shadow: none; } +/* all types of buttons */ input[type=submit], input.button, a.button, button, .qq-upload-button { - /* no style.ini colours on purpose */ color: #333; background-color: #eee; background: -moz-linear-gradient( top, #ffffff 0%, #f4f4f4 30%, #eeeeee 99%, #cccccc 99%); @@ -358,3 +359,38 @@ button, cursor: pointer; } +input[type=submit]:hover, +input[type=submit]:active, +input[type=submit]:focus, +input.button:hover, +input.button:active, +input.button:focus, +a.button:hover, +a.button:active, +a.button:focus, +button:hover, +button:active, +button:focus, +.qq-upload-button:hover { + border-color: #999; + background-color: #ddd; + background: -moz-linear-gradient( top, #ffffff 0%, #f4f4f4 30%, #dddddd 99%, #cccccc 99%); + background: -webkit-linear-gradient(top, #ffffff 0%, #f4f4f4 30%, #dddddd 99%, #bbbbbb 99%); + background: -o-linear-gradient( top, #ffffff 0%, #f4f4f4 30%, #dddddd 99%, #cccccc 99%); + background: -ms-linear-gradient( top, #ffffff 0%, #f4f4f4 30%, #dddddd 99%, #cccccc 99%); + background: linear-gradient( top, #ffffff 0%, #f4f4f4 30%, #dddddd 99%, #bbbbbb 99%); +} + +input::-moz-focus-inner, +button::-moz-focus-inner { + border: 0; + padding: 0; +} + +input[disabled], +button[disabled], +input[readonly], +button[readonly] { + cursor: auto; +} + -- cgit v1.2.3 From f33b75ddfb6aa5108edff800dee6948321751db0 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Sun, 15 Jan 2012 13:07:31 +0000 Subject: moved styles for pagetools into their own css file --- css/design.css | 189 ------------------------------------------------------ css/pagetools.css | 189 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ style.ini | 1 + 3 files changed, 190 insertions(+), 189 deletions(-) create mode 100644 css/pagetools.css diff --git a/css/design.css b/css/design.css index 2d9c1da9d..b008f201c 100755 --- a/css/design.css +++ b/css/design.css @@ -103,195 +103,6 @@ #dokuwiki__usertools ul li.user { } -/*____________ page tools ____________*/ - -#dokuwiki__site .site { - padding-left: 40px; - padding-right: 40px; -} -#dokuwiki__usertools { - right: 40px; -} - -#dokuwiki__pagetools { - position: absolute; - right: -42px; - top: 2em; -} - -#dokuwiki__pagetools div.tools { - position: fixed; -} - -#dokuwiki__pagetools ul { - position: absolute; - right: 0; - margin: 0; - padding: 0; - text-align: right; -} - -#dokuwiki__pagetools.version03 ul { - border: 1px solid __border__; - border-radius: 2px; - background-color: __background__; - box-shadow: .1em .1em .1em __text__; - margin: 0 -.5em; -} -#dokuwiki__pagetools.version02:hover ul li a span, -#dokuwiki__pagetools.version02:active ul li a span, -#dokuwiki__pagetools.version02:focus ul li a span, -#dokuwiki__pagetools.version03:hover ul li a span, -#dokuwiki__pagetools.version03:active ul li a span, -#dokuwiki__pagetools.version03:focus ul li a span { - display: inline; -} -#dokuwiki__pagetools.version02 ul { - margin: 0 -.5em; - border: 1px solid transparent; -} -#dokuwiki__pagetools.version02:hover ul { - border: 1px solid __border__; - border-radius: 2px; - background-color: __background__; - box-shadow: .1em .1em .1em __text__; -} - - -#dokuwiki__pagetools ul li { - padding: 0; - margin: 0; - list-style: none; - font-size: 0.875em; -} - -#dokuwiki__pagetools ul li a { - display: block; - min-height: 17px; - padding: .5em 34px .5em 1em; - background-repeat: no-repeat; - background-position: right center; - white-space: nowrap; - border: 1px solid transparent; -} -#dokuwiki__pagetools.version02 ul li a, -#dokuwiki__pagetools.version03 ul li a { - padding: .2em 34px .2em .5em; -} -#dokuwiki__pagetools.version01 ul li a:hover, -#dokuwiki__pagetools.version01 ul li a:active, -#dokuwiki__pagetools.version01 ul li a:focus { - border-radius: 2px; - background-color: __background__; - box-shadow: .1em .1em .1em __text__; - text-decoration: none; - border-color: __border__; -} -#dokuwiki__pagetools ul li a span { - display: none; -} -#dokuwiki__pagetools.version01 ul li a:hover span, -#dokuwiki__pagetools.version01 ul li a:active span, -#dokuwiki__pagetools.version01 ul li a:focus span { - display: inline; -} - - - -/* @todo: add NEW icons */ -#dokuwiki__pagetools ul li a.edit { - background-image: url(images/pagetools/edit.png); -} -#dokuwiki__pagetools ul li a.edit:hover, -#dokuwiki__pagetools ul li a.edit:active, -#dokuwiki__pagetools ul li a.edit:focus { - background-image: url(images/pagetools/edit-active.png); -} - -#dokuwiki__pagetools ul li a.create { - background-image: url(images/pagetools/create.png); -} -#dokuwiki__pagetools ul li a.create:hover, -#dokuwiki__pagetools ul li a.create:active, -#dokuwiki__pagetools ul li a.create:focus { - background-image: url(images/pagetools/create-active.png); -} - -#dokuwiki__pagetools ul li a.show { - background-image: url(images/pagetools/show.png); -} -#dokuwiki__pagetools ul li a.show:hover, -#dokuwiki__pagetools ul li a.show:active, -#dokuwiki__pagetools ul li a.show:focus { - background-image: url(images/pagetools/show-active.png); -} - -#dokuwiki__pagetools ul li a.source { - background-image: url(images/pagetools/source.png); -} -#dokuwiki__pagetools ul li a.source:hover, -#dokuwiki__pagetools ul li a.source:active, -#dokuwiki__pagetools ul li a.source:focus { - background-image: url(images/pagetools/source-active.png); -} - -#dokuwiki__pagetools ul li a.draft { - background-image: url(images/pagetools/draft.png); -} -#dokuwiki__pagetools ul li a.draft:hover, -#dokuwiki__pagetools ul li a.draft:active, -#dokuwiki__pagetools ul li a.draft:focus { - background-image: url(images/pagetools/draft-active.png); -} - -#dokuwiki__pagetools ul li a.revs { - background-image: url(images/pagetools/revisions.png); -} -#dokuwiki__pagetools ul li a.revs:hover, -#dokuwiki__pagetools ul li a.revs:active, -#dokuwiki__pagetools ul li a.revs:focus, -.mode_revisions #dokuwiki__pagetools ul li a.revs { - background-image: url(images/pagetools/revisions-active.png); -} - -#dokuwiki__pagetools ul li a.backlink { - background-image: url(images/pagetools/backlink.png); -} -#dokuwiki__pagetools ul li a.backlink:hover, -#dokuwiki__pagetools ul li a.backlink:active, -#dokuwiki__pagetools ul li a.backlink:focus, -.mode_backlink #dokuwiki__pagetools ul li a.backlink { - background-image: url(images/pagetools/backlink-active.png); -} - -#dokuwiki__pagetools ul li a.top { - background-image: url(images/pagetools/top.png); -} -#dokuwiki__pagetools ul li a.top:hover, -#dokuwiki__pagetools ul li a.top:active, -#dokuwiki__pagetools ul li a.top:focus { - background-image: url(images/pagetools/top-active.png); -} - -#dokuwiki__pagetools ul li a.revert { - background-image: url(images/pagetools/revert.png); -} -#dokuwiki__pagetools ul li a.revert:hover, -#dokuwiki__pagetools ul li a.revert:active, -#dokuwiki__pagetools ul li a.revert:focus, -.mode_revert #dokuwiki__pagetools ul li a.revert { - background-image: url(images/pagetools/revert-active.png); -} - -#dokuwiki__pagetools ul li a.subscribe { - background-image: url(images/pagetools/subscribe.png); -} -#dokuwiki__pagetools ul li a.subscribe:hover, -#dokuwiki__pagetools ul li a.subscribe:active, -#dokuwiki__pagetools ul li a.subscribe:focus, -.mode_subscribe #dokuwiki__pagetools ul li a.subscribe { - background-image: url(images/pagetools/subscribe-active.png); -} /*____________ site tools ____________*/ diff --git a/css/pagetools.css b/css/pagetools.css new file mode 100644 index 000000000..26b4ea6fc --- /dev/null +++ b/css/pagetools.css @@ -0,0 +1,189 @@ +/*____________ page tools ____________*/ + +#dokuwiki__site .site { + padding-left: 40px; + padding-right: 40px; +} +#dokuwiki__usertools { + right: 40px; +} + +#dokuwiki__pagetools { + position: absolute; + right: -42px; + top: 2em; +} + +#dokuwiki__pagetools div.tools { + position: fixed; +} + +#dokuwiki__pagetools ul { + position: absolute; + right: 0; + margin: 0; + padding: 0; + text-align: right; +} + +#dokuwiki__pagetools.version03 ul { + border: 1px solid __border__; + border-radius: 2px; + background-color: __background__; + box-shadow: .1em .1em .1em __text__; + margin: 0 -.5em; +} +#dokuwiki__pagetools.version02:hover ul li a span, +#dokuwiki__pagetools.version02:active ul li a span, +#dokuwiki__pagetools.version02:focus ul li a span, +#dokuwiki__pagetools.version03:hover ul li a span, +#dokuwiki__pagetools.version03:active ul li a span, +#dokuwiki__pagetools.version03:focus ul li a span { + display: inline; +} +#dokuwiki__pagetools.version02 ul { + margin: 0 -.5em; + border: 1px solid transparent; +} +#dokuwiki__pagetools.version02:hover ul { + border: 1px solid __border__; + border-radius: 2px; + background-color: __background__; + box-shadow: .1em .1em .1em __text__; +} + + +#dokuwiki__pagetools ul li { + padding: 0; + margin: 0; + list-style: none; + font-size: 0.875em; +} + +#dokuwiki__pagetools ul li a { + display: block; + min-height: 17px; + padding: .5em 34px .5em 1em; + background-repeat: no-repeat; + background-position: right center; + white-space: nowrap; + border: 1px solid transparent; +} +#dokuwiki__pagetools.version02 ul li a, +#dokuwiki__pagetools.version03 ul li a { + padding: .2em 34px .2em .5em; +} +#dokuwiki__pagetools.version01 ul li a:hover, +#dokuwiki__pagetools.version01 ul li a:active, +#dokuwiki__pagetools.version01 ul li a:focus { + border-radius: 2px; + background-color: __background__; + box-shadow: .1em .1em .1em __text__; + text-decoration: none; + border-color: __border__; +} +#dokuwiki__pagetools ul li a span { + display: none; +} +#dokuwiki__pagetools.version01 ul li a:hover span, +#dokuwiki__pagetools.version01 ul li a:active span, +#dokuwiki__pagetools.version01 ul li a:focus span { + display: inline; +} + + + +/* @todo: add NEW icons */ +#dokuwiki__pagetools ul li a.edit { + background-image: url(images/pagetools/edit.png); +} +#dokuwiki__pagetools ul li a.edit:hover, +#dokuwiki__pagetools ul li a.edit:active, +#dokuwiki__pagetools ul li a.edit:focus { + background-image: url(images/pagetools/edit-active.png); +} + +#dokuwiki__pagetools ul li a.create { + background-image: url(images/pagetools/create.png); +} +#dokuwiki__pagetools ul li a.create:hover, +#dokuwiki__pagetools ul li a.create:active, +#dokuwiki__pagetools ul li a.create:focus { + background-image: url(images/pagetools/create-active.png); +} + +#dokuwiki__pagetools ul li a.show { + background-image: url(images/pagetools/show.png); +} +#dokuwiki__pagetools ul li a.show:hover, +#dokuwiki__pagetools ul li a.show:active, +#dokuwiki__pagetools ul li a.show:focus { + background-image: url(images/pagetools/show-active.png); +} + +#dokuwiki__pagetools ul li a.source { + background-image: url(images/pagetools/source.png); +} +#dokuwiki__pagetools ul li a.source:hover, +#dokuwiki__pagetools ul li a.source:active, +#dokuwiki__pagetools ul li a.source:focus { + background-image: url(images/pagetools/source-active.png); +} + +#dokuwiki__pagetools ul li a.draft { + background-image: url(images/pagetools/draft.png); +} +#dokuwiki__pagetools ul li a.draft:hover, +#dokuwiki__pagetools ul li a.draft:active, +#dokuwiki__pagetools ul li a.draft:focus { + background-image: url(images/pagetools/draft-active.png); +} + +#dokuwiki__pagetools ul li a.revs { + background-image: url(images/pagetools/revisions.png); +} +#dokuwiki__pagetools ul li a.revs:hover, +#dokuwiki__pagetools ul li a.revs:active, +#dokuwiki__pagetools ul li a.revs:focus, +.mode_revisions #dokuwiki__pagetools ul li a.revs { + background-image: url(images/pagetools/revisions-active.png); +} + +#dokuwiki__pagetools ul li a.backlink { + background-image: url(images/pagetools/backlink.png); +} +#dokuwiki__pagetools ul li a.backlink:hover, +#dokuwiki__pagetools ul li a.backlink:active, +#dokuwiki__pagetools ul li a.backlink:focus, +.mode_backlink #dokuwiki__pagetools ul li a.backlink { + background-image: url(images/pagetools/backlink-active.png); +} + +#dokuwiki__pagetools ul li a.top { + background-image: url(images/pagetools/top.png); +} +#dokuwiki__pagetools ul li a.top:hover, +#dokuwiki__pagetools ul li a.top:active, +#dokuwiki__pagetools ul li a.top:focus { + background-image: url(images/pagetools/top-active.png); +} + +#dokuwiki__pagetools ul li a.revert { + background-image: url(images/pagetools/revert.png); +} +#dokuwiki__pagetools ul li a.revert:hover, +#dokuwiki__pagetools ul li a.revert:active, +#dokuwiki__pagetools ul li a.revert:focus, +.mode_revert #dokuwiki__pagetools ul li a.revert { + background-image: url(images/pagetools/revert-active.png); +} + +#dokuwiki__pagetools ul li a.subscribe { + background-image: url(images/pagetools/subscribe.png); +} +#dokuwiki__pagetools ul li a.subscribe:hover, +#dokuwiki__pagetools ul li a.subscribe:active, +#dokuwiki__pagetools ul li a.subscribe:focus, +.mode_subscribe #dokuwiki__pagetools ul li a.subscribe { + background-image: url(images/pagetools/subscribe-active.png); +} diff --git a/style.ini b/style.ini index 08d5639a9..ebefcd9a6 100755 --- a/style.ini +++ b/style.ini @@ -26,6 +26,7 @@ css/_forms.css = screen css/_admin.css = screen css/structure.css = screen css/design.css = screen +css/pagetools.css = screen css/content.css = screen css/includes.css = screen -- cgit v1.2.3 From b6a12f16c2a9e80be9875746e9bc6bbb3ce41f97 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Sun, 15 Jan 2012 13:11:30 +0000 Subject: added site background colour to style.ini --- css/basic.css | 13 ++++++------- style.ini | 27 ++++++++++++++------------- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/css/basic.css b/css/basic.css index 3c4ea32bd..b266f8036 100755 --- a/css/basic.css +++ b/css/basic.css @@ -14,14 +14,13 @@ html { } html, body { - /* @todo: style.ini for #fbfaf9?!? */ - background-color: #fbfaf9; color: __text__; - background-image: -moz-linear-gradient( top, __background_neu__ 0%, __background_alt__ 1em, #fbfaf9 4em); - background-image: -webkit-linear-gradient(top, __background_neu__ 0%, __background_alt__ 1em, #fbfaf9 4em); - background-image: -o-linear-gradient( top, __background_neu__ 0%, __background_alt__ 1em, #fbfaf9 4em); - background-image: -ms-linear-gradient( top, __background_neu__ 0%, __background_alt__ 1em, #fbfaf9 4em); - background-image: linear-gradient( top, __background_neu__ 0%, __background_alt__ 1em, #fbfaf9 4em); + background-color: __background_site__; + background-image: -moz-linear-gradient( top, __background_neu__ 0%, __background_alt__ 1em, __background_site__ 4em); + background-image: -webkit-linear-gradient(top, __background_neu__ 0%, __background_alt__ 1em, __background_site__ 4em); + background-image: -o-linear-gradient( top, __background_neu__ 0%, __background_alt__ 1em, __background_site__ 4em); + background-image: -ms-linear-gradient( top, __background_neu__ 0%, __background_alt__ 1em, __background_site__ 4em); + background-image: linear-gradient( top, __background_neu__ 0%, __background_alt__ 1em, __background_site__ 4em); background-size: 1px 10em; background-repeat: repeat-x; margin: 0; diff --git a/style.ini b/style.ini index ebefcd9a6..d1e3b6c8e 100755 --- a/style.ini +++ b/style.ini @@ -44,27 +44,28 @@ css/print.css = print ;------ guaranteed dokuwiki color placeholders that every plugin can use ; main text and background colors -__text__ = "#333" -__background__ = "#fff" +__text__ = "#333" +__background__ = "#fff" +__background_site__ = "#fbfaf9" ; alternative text and background colors -__text_alt__ = "#999" -__background_alt__ = "#eee" +__text_alt__ = "#999" +__background_alt__ = "#eee" ; neutral text and background colors -__text_neu__ = "#666" -__background_neu__ = "#ddd" +__text_neu__ = "#666" +__background_neu__ = "#ddd" ; border color -__border__ = "#ccc" +__border__ = "#ccc" ;-------------------------------------------------------------------------- ; these are used for links -__link__ = "#627D9A" -__existing__ = "#090" -__missing__ = "#f30" +__link__ = "#627D9A" +__existing__ = "#090" +__missing__ = "#f30" ; highlighting search snippets -__highlight__ = "#ff9" +__highlight__ = "#ff9" ; sidebar width -__site_width__ = "72em" -__sidebar_width__ = "16em" +__site_width__ = "72em" +__sidebar_width__ = "16em" -- cgit v1.2.3 From add16d6f67940faed96faa9438ab739221d097f6 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Sun, 15 Jan 2012 15:38:19 +0000 Subject: added new icons for bullets and TOC --- css/_toc.css | 1 - css/content.css | 7 +++++++ images/bullet.png | Bin 137 -> 302 bytes images/closed.png | Bin 165 -> 269 bytes images/open.png | Bin 159 -> 265 bytes images/toc-arrows.png | Bin 366 -> 322 bytes 6 files changed, 7 insertions(+), 1 deletion(-) diff --git a/css/_toc.css b/css/_toc.css index 8aaa060e8..0ea6d0c74 100755 --- a/css/_toc.css +++ b/css/_toc.css @@ -76,7 +76,6 @@ margin: 0; } .dokuwiki #toc__inside ul li { - list-style: disc; padding: 0; margin: 0; } diff --git a/css/content.css b/css/content.css index 03c9221cf..555819749 100755 --- a/css/content.css +++ b/css/content.css @@ -39,6 +39,13 @@ } +/*____________ lists ____________ + +.dokuwiki ul li { + list-style-image: url(images/bullet.png); +} +*/ + /*____________ tables ____________*/ .dokuwiki table.inline { diff --git a/images/bullet.png b/images/bullet.png index da87696c7..4d4b2b541 100755 Binary files a/images/bullet.png and b/images/bullet.png differ diff --git a/images/closed.png b/images/closed.png index 3691ebc17..4730fe829 100755 Binary files a/images/closed.png and b/images/closed.png differ diff --git a/images/open.png b/images/open.png index eafb64ed3..188d809ce 100755 Binary files a/images/open.png and b/images/open.png differ diff --git a/images/toc-arrows.png b/images/toc-arrows.png index d55253186..9f441eb26 100644 Binary files a/images/toc-arrows.png and b/images/toc-arrows.png differ -- cgit v1.2.3 From 489159e3bfa7c10f9f09df81f09a484736ce5c78 Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Thu, 22 Dec 2011 16:19:24 +0100 Subject: don't limit download sizes in plugin manager --- lib/plugins/plugin/classes/ap_download.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/plugins/plugin/classes/ap_download.class.php b/lib/plugins/plugin/classes/ap_download.class.php index 6aab4ba3c..b2571f632 100644 --- a/lib/plugins/plugin/classes/ap_download.class.php +++ b/lib/plugins/plugin/classes/ap_download.class.php @@ -59,7 +59,7 @@ class ap_download extends ap_manage { return false; } - if (!$file = io_download($url, "$tmp/", true, $file)) { + if (!$file = io_download($url, "$tmp/", true, $file, 0)) { $this->manager->error = sprintf($this->lang['error_download'],$url)."\n"; } -- cgit v1.2.3 From 29e4fe3d4e010b156d59d2ea20458f777203232a Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Wed, 18 Jan 2012 11:12:11 +0100 Subject: Removed obsolete Opera fix that now causes harm FS#2429 --- lib/exe/ajax.php | 5 ----- 1 file changed, 5 deletions(-) diff --git a/lib/exe/ajax.php b/lib/exe/ajax.php index 46d835187..3d1584244 100644 --- a/lib/exe/ajax.php +++ b/lib/exe/ajax.php @@ -6,11 +6,6 @@ * @author Andreas Gohr */ -//fix for Opera XMLHttpRequests -if(!count($_POST) && !empty($HTTP_RAW_POST_DATA)){ - parse_str($HTTP_RAW_POST_DATA, $_POST); -} - if(!defined('DOKU_INC')) define('DOKU_INC',dirname(__FILE__).'/../../'); require_once(DOKU_INC.'inc/init.php'); //close session -- cgit v1.2.3 From e96b69da63a04f9397c4a7d03253207f6ccff056 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Thu, 19 Jan 2012 09:39:57 +0000 Subject: corrected old mediaupload introduction text --- inc/lang/de-informal/lang.php | 2 +- inc/lang/de/lang.php | 2 +- inc/lang/en/lang.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/inc/lang/de-informal/lang.php b/inc/lang/de-informal/lang.php index 56751629c..eca04bbc4 100644 --- a/inc/lang/de-informal/lang.php +++ b/inc/lang/de-informal/lang.php @@ -168,7 +168,7 @@ $lang['accessdenied'] = 'Du hast keinen Zugriff auf diese Seite'; $lang['mediausage'] = 'Syntax zum Verwenden dieser Datei:'; $lang['mediaview'] = 'Originaldatei öffnen'; $lang['mediaroot'] = 'Wurzel'; -$lang['mediaupload'] = 'Lade hier eine Datei in den momentanen Namensraum hoch. Um Unterordner zu erstellen, stelle diese dem Dateinamen im Feld "Hochladen als" durch Doppelpunkt getrennt voran.'; +$lang['mediaupload'] = 'Lade hier eine Datei in den momentanen Namensraum hoch. Um Unterordner zu erstellen, stelle diese dem Dateinamen durch Doppelpunkt getrennt voran, nachdem Du die Datei ausgewählt hast.'; $lang['mediaextchange'] = 'Dateiendung vom .%s nach .%s geändert!'; $lang['reference'] = 'Verwendung von'; $lang['ref_inuse'] = 'Diese Datei kann nicht gelöscht werden, da sie noch von folgenden Seiten benutzt wird:'; diff --git a/inc/lang/de/lang.php b/inc/lang/de/lang.php index 4e7e6abbb..08e72fec2 100644 --- a/inc/lang/de/lang.php +++ b/inc/lang/de/lang.php @@ -170,7 +170,7 @@ $lang['accessdenied'] = 'Es ist Ihnen nicht gestattet, diese Seite zu s $lang['mediausage'] = 'Syntax zum Verwenden dieser Datei:'; $lang['mediaview'] = 'Originaldatei öffnen'; $lang['mediaroot'] = 'Wurzel'; -$lang['mediaupload'] = 'Laden Sie hier eine Datei in den momentanen Namensraum hoch. Um Unterordner zu erstellen, stellen Sie diese dem Dateinamen im Feld "Hochladen als" durch Doppelpunkt getrennt voran.'; +$lang['mediaupload'] = 'Laden Sie hier eine Datei in den momentanen Namensraum hoch. Um Unterordner zu erstellen, stellen Sie diese dem Dateinamen durch Doppelpunkt getrennt voran, nachdem Sie die Datei ausgewählt haben.'; $lang['mediaextchange'] = 'Dateiendung vom .%s nach .%s geändert!'; $lang['reference'] = 'Verwendung von'; $lang['ref_inuse'] = 'Diese Datei kann nicht gelöscht werden, da sie noch von folgenden Seiten benutzt wird:'; diff --git a/inc/lang/en/lang.php b/inc/lang/en/lang.php index 1bfff2897..3f74a8d9c 100644 --- a/inc/lang/en/lang.php +++ b/inc/lang/en/lang.php @@ -166,7 +166,7 @@ $lang['accessdenied'] = 'You are not allowed to view this page.'; $lang['mediausage'] = 'Use the following syntax to reference this file:'; $lang['mediaview'] = 'View original file'; $lang['mediaroot'] = 'root'; -$lang['mediaupload'] = 'Upload a file to the current namespace here. To create subnamespaces, prepend them to your "Upload as" filename separated by colons. Files also can be selected by drag and drop.'; +$lang['mediaupload'] = 'Upload a file to the current namespace here. To create subnamespaces, prepend them to your filename separated by colons after you selected the files. Files can also be selected by drag and drop.'; $lang['mediaextchange'] = 'Filextension changed from .%s to .%s!'; $lang['reference'] = 'References for'; $lang['ref_inuse'] = 'The file can\'t be deleted, because it\'s still used by the following pages:'; -- cgit v1.2.3 From d5d7b9b95394c901cb349f16efdb233e4d9823ad Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Sun, 22 Jan 2012 01:13:50 +0000 Subject: merged pagetools versions 1 and 2: show all tools on hover and individual tools on focus (closes #2 and closes #17) --- css/pagetools.css | 84 ++++++++++++++++++++++++------------------------------- main.php | 2 +- 2 files changed, 38 insertions(+), 48 deletions(-) diff --git a/css/pagetools.css b/css/pagetools.css index 26b4ea6fc..839611baa 100644 --- a/css/pagetools.css +++ b/css/pagetools.css @@ -1,16 +1,26 @@ + /*____________ page tools ____________*/ #dokuwiki__site .site { - padding-left: 40px; + /* give space to the right so the tools won't disappear on smaller screens */ + /* it's 40px because the 30px wide icons will have 5px more spacing to the left and right */ padding-right: 40px; + /* give the same space to the left to balance it out */ + padding-left: 40px; +} +.dokuwiki div.page { + min-height: 190px; /* 30 (= height of icons) x 6 (= maximum number of possible tools) + 2x5 */ } #dokuwiki__usertools { + /* move the tools just outside of the site */ right: 40px; } + #dokuwiki__pagetools { position: absolute; - right: -42px; + right: -40px; + /* on same vertical level as first headline, because .page has 2em padding */ top: 2em; } @@ -21,37 +31,12 @@ #dokuwiki__pagetools ul { position: absolute; right: 0; + text-align: right; margin: 0; padding: 0; - text-align: right; -} - -#dokuwiki__pagetools.version03 ul { - border: 1px solid __border__; - border-radius: 2px; - background-color: __background__; - box-shadow: .1em .1em .1em __text__; - margin: 0 -.5em; -} -#dokuwiki__pagetools.version02:hover ul li a span, -#dokuwiki__pagetools.version02:active ul li a span, -#dokuwiki__pagetools.version02:focus ul li a span, -#dokuwiki__pagetools.version03:hover ul li a span, -#dokuwiki__pagetools.version03:active ul li a span, -#dokuwiki__pagetools.version03:focus ul li a span { - display: inline; -} -#dokuwiki__pagetools.version02 ul { - margin: 0 -.5em; + /* add transparent border to prevent jumping when proper border is added on hover */ border: 1px solid transparent; } -#dokuwiki__pagetools.version02:hover ul { - border: 1px solid __border__; - border-radius: 2px; - background-color: __background__; - box-shadow: .1em .1em .1em __text__; -} - #dokuwiki__pagetools ul li { padding: 0; @@ -62,35 +47,40 @@ #dokuwiki__pagetools ul li a { display: block; - min-height: 17px; - padding: .5em 34px .5em 1em; + min-height: 20px; /* 30 - 2x5 */ + line-height: 20px; + padding: 5px 40px 5px 5px; background-repeat: no-repeat; background-position: right center; - white-space: nowrap; + /* add transparent border to prevent jumping when proper border is added on focus */ border: 1px solid transparent; + white-space: nowrap; } -#dokuwiki__pagetools.version02 ul li a, -#dokuwiki__pagetools.version03 ul li a { - padding: .2em 34px .2em .5em; + +/* hide labels accessibly when neither on hover nor on focus */ +#dokuwiki__pagetools ul li a span { + position: absolute; + left: -99999px; } -#dokuwiki__pagetools.version01 ul li a:hover, -#dokuwiki__pagetools.version01 ul li a:active, -#dokuwiki__pagetools.version01 ul li a:focus { - border-radius: 2px; + +/* show all tools on hover and individual tools on focus */ +#dokuwiki__pagetools:hover ul, +#dokuwiki__pagetools ul li a:focus { background-color: __background__; - box-shadow: .1em .1em .1em __text__; - text-decoration: none; border-color: __border__; + border-radius: 2px; + box-shadow: 2px 2px 2px __text_alt__; } -#dokuwiki__pagetools ul li a span { - display: none; -} -#dokuwiki__pagetools.version01 ul li a:hover span, -#dokuwiki__pagetools.version01 ul li a:active span, -#dokuwiki__pagetools.version01 ul li a:focus span { + +#dokuwiki__pagetools:hover ul li a span, +#dokuwiki__pagetools ul li a:focus span { display: inline; + position: static; } +#dokuwiki__pagetools ul li a:focus { + text-decoration: none; +} /* @todo: add NEW icons */ diff --git a/main.php b/main.php index 825fd3cf6..2a66d1df0 100755 --- a/main.php +++ b/main.php @@ -142,7 +142,7 @@ $showSidebar = tpl_getConf('sidebarID') && page_exists(tpl_getConf('sidebarID')) -
    +

      -- cgit v1.2.3 From 995dc0ce9ce4e23e9f15e7088aa1219ab72835cb Mon Sep 17 00:00:00 2001 From: Dominik Eckelmann Date: Sun, 22 Jan 2012 11:58:01 +0100 Subject: fixed testcase --- _test/cases/inc/remote.test.php | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/_test/cases/inc/remote.test.php b/_test/cases/inc/remote.test.php index f5da3c06d..186f8e65a 100644 --- a/_test/cases/inc/remote.test.php +++ b/_test/cases/inc/remote.test.php @@ -2,9 +2,14 @@ require_once DOKU_INC . 'inc/init.php'; require_once DOKU_INC . 'inc/RemoteAPICore.php'; +require_once DOKU_INC . 'inc/auth/basic.class.php'; Mock::generate('Doku_Plugin_Controller'); +class MockAuth extends auth_basic { + function isCaseSensitive() { return true; } +} + class RemoteAPICoreTest { function __getRemoteInfo() { @@ -122,6 +127,7 @@ class remote_test extends UnitTestCase { global $plugin_controller; global $conf; global $USERINFO; + global $auth; parent::setUp(); $pluginManager = new MockDoku_Plugin_Controller(); @@ -136,6 +142,8 @@ class remote_test extends UnitTestCase { $this->userinfo = $USERINFO; $this->remote = new RemoteAPI(); + + $auth = new MockAuth(); } function tearDown() { @@ -185,7 +193,6 @@ class remote_test extends UnitTestCase { $conf['useacl'] = 1; $conf['remoteuser'] = '@grp,@grp2'; $USERINFO['grps'] = array('grp'); - $this->assertTrue($this->remote->hasAccess()); } -- cgit v1.2.3 From 200ff6b799de7ba300488ec4cb4833c0092761e5 Mon Sep 17 00:00:00 2001 From: Dominik Eckelmann Date: Sun, 22 Jan 2012 11:58:39 +0100 Subject: removed unused class --- inc/remote.php | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/inc/remote.php b/inc/remote.php index 8c505911c..0a507e95d 100644 --- a/inc/remote.php +++ b/inc/remote.php @@ -6,18 +6,6 @@ require_once(DOKU_INC.'inc/RemoteAPICore.php'); class RemoteException extends Exception {} class RemoteAccessDeniedException extends RemoteException {} -abstract class RemoteDataType { - private $value; - - function __construct($value) { - $this->value = $value; - } - - function getValue() { - return $this->value; - } -} - /** * This class provides information about remote access to the wiki. * -- cgit v1.2.3 From 71b389de5e004e21085491a3be888172ac20b272 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Sun, 22 Jan 2012 11:09:37 +0000 Subject: made a sprite out of all the pagetool icons; changed the revert icon to look less like a refresh icon; made active colour less subtle (closes #5) --- css/pagetools.css | 46 +++++++++++++++++----------------- images/pagetools/backlink-active.png | Bin 1053 -> 0 bytes images/pagetools/backlink.png | Bin 998 -> 0 bytes images/pagetools/create-active.png | Bin 920 -> 0 bytes images/pagetools/create.png | Bin 885 -> 0 bytes images/pagetools/draft-active.png | Bin 988 -> 0 bytes images/pagetools/draft.png | Bin 935 -> 0 bytes images/pagetools/edit-active.png | Bin 845 -> 0 bytes images/pagetools/edit.png | Bin 807 -> 0 bytes images/pagetools/pagetools-sprite.png | Bin 0 -> 13032 bytes images/pagetools/pagetools-sprite.xcf | Bin 0 -> 30556 bytes images/pagetools/pagetools.xcf | Bin 13291 -> 12934 bytes images/pagetools/revert-active.png | Bin 794 -> 0 bytes images/pagetools/revert.png | Bin 768 -> 0 bytes images/pagetools/revisions-active.png | Bin 1543 -> 0 bytes images/pagetools/revisions.png | Bin 1520 -> 0 bytes images/pagetools/show-active.png | Bin 455 -> 0 bytes images/pagetools/show.png | Bin 454 -> 0 bytes images/pagetools/source-active.png | Bin 944 -> 0 bytes images/pagetools/source.png | Bin 921 -> 0 bytes images/pagetools/subscribe-active.png | Bin 769 -> 0 bytes images/pagetools/subscribe.png | Bin 750 -> 0 bytes images/pagetools/top-active.png | Bin 506 -> 0 bytes images/pagetools/top.png | Bin 494 -> 0 bytes 24 files changed, 23 insertions(+), 23 deletions(-) delete mode 100644 images/pagetools/backlink-active.png delete mode 100644 images/pagetools/backlink.png delete mode 100644 images/pagetools/create-active.png delete mode 100644 images/pagetools/create.png delete mode 100644 images/pagetools/draft-active.png delete mode 100644 images/pagetools/draft.png delete mode 100644 images/pagetools/edit-active.png delete mode 100644 images/pagetools/edit.png create mode 100644 images/pagetools/pagetools-sprite.png create mode 100644 images/pagetools/pagetools-sprite.xcf delete mode 100644 images/pagetools/revert-active.png delete mode 100644 images/pagetools/revert.png delete mode 100644 images/pagetools/revisions-active.png delete mode 100644 images/pagetools/revisions.png delete mode 100644 images/pagetools/show-active.png delete mode 100644 images/pagetools/show.png delete mode 100644 images/pagetools/source-active.png delete mode 100644 images/pagetools/source.png delete mode 100644 images/pagetools/subscribe-active.png delete mode 100644 images/pagetools/subscribe.png delete mode 100644 images/pagetools/top-active.png delete mode 100644 images/pagetools/top.png diff --git a/css/pagetools.css b/css/pagetools.css index 839611baa..d097d36ed 100644 --- a/css/pagetools.css +++ b/css/pagetools.css @@ -50,8 +50,9 @@ min-height: 20px; /* 30 - 2x5 */ line-height: 20px; padding: 5px 40px 5px 5px; + background-image: url(images/pagetools/pagetools-sprite.png); + background-position: right 0; background-repeat: no-repeat; - background-position: right center; /* add transparent border to prevent jumping when proper border is added on focus */ border: 1px solid transparent; white-space: nowrap; @@ -82,98 +83,97 @@ text-decoration: none; } - -/* @todo: add NEW icons */ +/* all available icons in sprite */ #dokuwiki__pagetools ul li a.edit { - background-image: url(images/pagetools/edit.png); + background-position: right 0; } #dokuwiki__pagetools ul li a.edit:hover, #dokuwiki__pagetools ul li a.edit:active, #dokuwiki__pagetools ul li a.edit:focus { - background-image: url(images/pagetools/edit-active.png); + background-position: right -45px; } #dokuwiki__pagetools ul li a.create { - background-image: url(images/pagetools/create.png); + background-position: right -90px; } #dokuwiki__pagetools ul li a.create:hover, #dokuwiki__pagetools ul li a.create:active, #dokuwiki__pagetools ul li a.create:focus { - background-image: url(images/pagetools/create-active.png); + background-position: right -135px; } #dokuwiki__pagetools ul li a.show { - background-image: url(images/pagetools/show.png); + background-position: right -270px; } #dokuwiki__pagetools ul li a.show:hover, #dokuwiki__pagetools ul li a.show:active, #dokuwiki__pagetools ul li a.show:focus { - background-image: url(images/pagetools/show-active.png); + background-position: right -315px; } #dokuwiki__pagetools ul li a.source { - background-image: url(images/pagetools/source.png); + background-position: right -360px; } #dokuwiki__pagetools ul li a.source:hover, #dokuwiki__pagetools ul li a.source:active, #dokuwiki__pagetools ul li a.source:focus { - background-image: url(images/pagetools/source-active.png); + background-position: right -405px; } #dokuwiki__pagetools ul li a.draft { - background-image: url(images/pagetools/draft.png); + background-position: right -180px; } #dokuwiki__pagetools ul li a.draft:hover, #dokuwiki__pagetools ul li a.draft:active, #dokuwiki__pagetools ul li a.draft:focus { - background-image: url(images/pagetools/draft-active.png); + background-position: right -225px; } #dokuwiki__pagetools ul li a.revs { - background-image: url(images/pagetools/revisions.png); + background-position: right -540px; } #dokuwiki__pagetools ul li a.revs:hover, #dokuwiki__pagetools ul li a.revs:active, #dokuwiki__pagetools ul li a.revs:focus, .mode_revisions #dokuwiki__pagetools ul li a.revs { - background-image: url(images/pagetools/revisions-active.png); + background-position: right -585px; } #dokuwiki__pagetools ul li a.backlink { - background-image: url(images/pagetools/backlink.png); + background-position: right -630px; } #dokuwiki__pagetools ul li a.backlink:hover, #dokuwiki__pagetools ul li a.backlink:active, #dokuwiki__pagetools ul li a.backlink:focus, .mode_backlink #dokuwiki__pagetools ul li a.backlink { - background-image: url(images/pagetools/backlink-active.png); + background-position: right -675px; } #dokuwiki__pagetools ul li a.top { - background-image: url(images/pagetools/top.png); + background-position: right -810px; } #dokuwiki__pagetools ul li a.top:hover, #dokuwiki__pagetools ul li a.top:active, #dokuwiki__pagetools ul li a.top:focus { - background-image: url(images/pagetools/top-active.png); + background-position: right -855px; } #dokuwiki__pagetools ul li a.revert { - background-image: url(images/pagetools/revert.png); + background-position: right -450px; } #dokuwiki__pagetools ul li a.revert:hover, #dokuwiki__pagetools ul li a.revert:active, #dokuwiki__pagetools ul li a.revert:focus, .mode_revert #dokuwiki__pagetools ul li a.revert { - background-image: url(images/pagetools/revert-active.png); + background-position: right -495px; } #dokuwiki__pagetools ul li a.subscribe { - background-image: url(images/pagetools/subscribe.png); + background-position: right -720px; } #dokuwiki__pagetools ul li a.subscribe:hover, #dokuwiki__pagetools ul li a.subscribe:active, #dokuwiki__pagetools ul li a.subscribe:focus, .mode_subscribe #dokuwiki__pagetools ul li a.subscribe { - background-image: url(images/pagetools/subscribe-active.png); + background-position: right -765px; } diff --git a/images/pagetools/backlink-active.png b/images/pagetools/backlink-active.png deleted file mode 100644 index 85ef7b810..000000000 Binary files a/images/pagetools/backlink-active.png and /dev/null differ diff --git a/images/pagetools/backlink.png b/images/pagetools/backlink.png deleted file mode 100644 index ef173bbf1..000000000 Binary files a/images/pagetools/backlink.png and /dev/null differ diff --git a/images/pagetools/create-active.png b/images/pagetools/create-active.png deleted file mode 100644 index c7ede442e..000000000 Binary files a/images/pagetools/create-active.png and /dev/null differ diff --git a/images/pagetools/create.png b/images/pagetools/create.png deleted file mode 100644 index 46e1c4fcc..000000000 Binary files a/images/pagetools/create.png and /dev/null differ diff --git a/images/pagetools/draft-active.png b/images/pagetools/draft-active.png deleted file mode 100644 index e4c0a6c72..000000000 Binary files a/images/pagetools/draft-active.png and /dev/null differ diff --git a/images/pagetools/draft.png b/images/pagetools/draft.png deleted file mode 100644 index d44cc8c3f..000000000 Binary files a/images/pagetools/draft.png and /dev/null differ diff --git a/images/pagetools/edit-active.png b/images/pagetools/edit-active.png deleted file mode 100644 index 31740052e..000000000 Binary files a/images/pagetools/edit-active.png and /dev/null differ diff --git a/images/pagetools/edit.png b/images/pagetools/edit.png deleted file mode 100644 index 1f266a410..000000000 Binary files a/images/pagetools/edit.png and /dev/null differ diff --git a/images/pagetools/pagetools-sprite.png b/images/pagetools/pagetools-sprite.png new file mode 100644 index 000000000..f34abdac5 Binary files /dev/null and b/images/pagetools/pagetools-sprite.png differ diff --git a/images/pagetools/pagetools-sprite.xcf b/images/pagetools/pagetools-sprite.xcf new file mode 100644 index 000000000..4bb1d68f4 Binary files /dev/null and b/images/pagetools/pagetools-sprite.xcf differ diff --git a/images/pagetools/pagetools.xcf b/images/pagetools/pagetools.xcf index ab4eaf634..759ae4841 100644 Binary files a/images/pagetools/pagetools.xcf and b/images/pagetools/pagetools.xcf differ diff --git a/images/pagetools/revert-active.png b/images/pagetools/revert-active.png deleted file mode 100644 index 84422f985..000000000 Binary files a/images/pagetools/revert-active.png and /dev/null differ diff --git a/images/pagetools/revert.png b/images/pagetools/revert.png deleted file mode 100644 index 03ab808f8..000000000 Binary files a/images/pagetools/revert.png and /dev/null differ diff --git a/images/pagetools/revisions-active.png b/images/pagetools/revisions-active.png deleted file mode 100644 index 3ff7252c0..000000000 Binary files a/images/pagetools/revisions-active.png and /dev/null differ diff --git a/images/pagetools/revisions.png b/images/pagetools/revisions.png deleted file mode 100644 index 48d47c524..000000000 Binary files a/images/pagetools/revisions.png and /dev/null differ diff --git a/images/pagetools/show-active.png b/images/pagetools/show-active.png deleted file mode 100644 index 9347bca1d..000000000 Binary files a/images/pagetools/show-active.png and /dev/null differ diff --git a/images/pagetools/show.png b/images/pagetools/show.png deleted file mode 100644 index 3aedef4e5..000000000 Binary files a/images/pagetools/show.png and /dev/null differ diff --git a/images/pagetools/source-active.png b/images/pagetools/source-active.png deleted file mode 100644 index c5b000237..000000000 Binary files a/images/pagetools/source-active.png and /dev/null differ diff --git a/images/pagetools/source.png b/images/pagetools/source.png deleted file mode 100644 index bdf38ae95..000000000 Binary files a/images/pagetools/source.png and /dev/null differ diff --git a/images/pagetools/subscribe-active.png b/images/pagetools/subscribe-active.png deleted file mode 100644 index aef1d0f44..000000000 Binary files a/images/pagetools/subscribe-active.png and /dev/null differ diff --git a/images/pagetools/subscribe.png b/images/pagetools/subscribe.png deleted file mode 100644 index a6db22ccd..000000000 Binary files a/images/pagetools/subscribe.png and /dev/null differ diff --git a/images/pagetools/top-active.png b/images/pagetools/top-active.png deleted file mode 100644 index c95789b55..000000000 Binary files a/images/pagetools/top-active.png and /dev/null differ diff --git a/images/pagetools/top.png b/images/pagetools/top.png deleted file mode 100644 index 3f37f5290..000000000 Binary files a/images/pagetools/top.png and /dev/null differ -- cgit v1.2.3 From ec69e514926e2630d74dcd5b73c656df279608db Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Sun, 22 Jan 2012 11:14:49 +0000 Subject: moved pagetools images out of pagetools folder, because there are now significantly less files involved --- css/pagetools.css | 2 +- images/pagetools-sprite.png | Bin 0 -> 13032 bytes images/pagetools-sprite.xcf | Bin 0 -> 30556 bytes images/pagetools.xcf | Bin 0 -> 12934 bytes images/pagetools/pagetools-sprite.png | Bin 13032 -> 0 bytes images/pagetools/pagetools-sprite.xcf | Bin 30556 -> 0 bytes images/pagetools/pagetools.xcf | Bin 12934 -> 0 bytes 7 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 images/pagetools-sprite.png create mode 100644 images/pagetools-sprite.xcf create mode 100644 images/pagetools.xcf delete mode 100644 images/pagetools/pagetools-sprite.png delete mode 100644 images/pagetools/pagetools-sprite.xcf delete mode 100644 images/pagetools/pagetools.xcf diff --git a/css/pagetools.css b/css/pagetools.css index d097d36ed..81ed571d9 100644 --- a/css/pagetools.css +++ b/css/pagetools.css @@ -50,7 +50,7 @@ min-height: 20px; /* 30 - 2x5 */ line-height: 20px; padding: 5px 40px 5px 5px; - background-image: url(images/pagetools/pagetools-sprite.png); + background-image: url(images/pagetools-sprite.png); background-position: right 0; background-repeat: no-repeat; /* add transparent border to prevent jumping when proper border is added on focus */ diff --git a/images/pagetools-sprite.png b/images/pagetools-sprite.png new file mode 100644 index 000000000..f34abdac5 Binary files /dev/null and b/images/pagetools-sprite.png differ diff --git a/images/pagetools-sprite.xcf b/images/pagetools-sprite.xcf new file mode 100644 index 000000000..4bb1d68f4 Binary files /dev/null and b/images/pagetools-sprite.xcf differ diff --git a/images/pagetools.xcf b/images/pagetools.xcf new file mode 100644 index 000000000..759ae4841 Binary files /dev/null and b/images/pagetools.xcf differ diff --git a/images/pagetools/pagetools-sprite.png b/images/pagetools/pagetools-sprite.png deleted file mode 100644 index f34abdac5..000000000 Binary files a/images/pagetools/pagetools-sprite.png and /dev/null differ diff --git a/images/pagetools/pagetools-sprite.xcf b/images/pagetools/pagetools-sprite.xcf deleted file mode 100644 index 4bb1d68f4..000000000 Binary files a/images/pagetools/pagetools-sprite.xcf and /dev/null differ diff --git a/images/pagetools/pagetools.xcf b/images/pagetools/pagetools.xcf deleted file mode 100644 index 759ae4841..000000000 Binary files a/images/pagetools/pagetools.xcf and /dev/null differ -- cgit v1.2.3 From 42ee96ded03b2ba3fee094f97d01e1bba47fe684 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Sun, 22 Jan 2012 12:39:38 +0000 Subject: removed conditional comments for IE6 from detail.php and mediamanager.php as well --- detail.php | 2 +- mediamanager.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/detail.php b/detail.php index 13ba1b9da..baaebcbf7 100755 --- a/detail.php +++ b/detail.php @@ -28,7 +28,7 @@ if (!defined('DOKU_INC')) die(); - +
      diff --git a/mediamanager.php b/mediamanager.php index 94c7a0149..01e1b82ae 100755 --- a/mediamanager.php +++ b/mediamanager.php @@ -26,7 +26,7 @@ if (!defined('DOKU_INC')) die(); - +
      -- cgit v1.2.3 From c0bf65d18c30e72f32d7ed1f60ec43e514a2632c Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Sun, 22 Jan 2012 13:31:31 +0000 Subject: updated _toc styles from the starter template and moved template-specific toc styles into design.css --- css/_toc.css | 57 ++++++++++++-------------------------------------------- css/design.css | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++++------ 2 files changed, 65 insertions(+), 51 deletions(-) diff --git a/css/_toc.css b/css/_toc.css index 0ea6d0c74..5b71de3ec 100755 --- a/css/_toc.css +++ b/css/_toc.css @@ -9,75 +9,42 @@ /* toc container */ .dokuwiki div.toc { float: right; - margin: -2em -2em .5em 1.4em; - width: __sidebar_width__; - border-left: 1px solid __border__; - background: __background__; + margin: 0 0 1.4em 1.4em; + width: 12em; + background-color: __background_alt__; color: inherit; } /*____________ toc header ____________*/ .dokuwiki div.tocheader { - padding: 0.5em 1em; + padding: .2em .5em; font-weight: bold; - font-size: 0.875em; - letter-spacing: .05em; } - .dokuwiki .toc span.toc_open, .dokuwiki .toc span.toc_close { - background: transparent url(images/toc-arrows.png) 0 0; - width: 8px; - height: 5px; - margin: .4em 0 0; float: right; -} -.dokuwiki .toc span.toc_open { - background-position: 0 -5px; -} - -.dokuwiki .toc span.toc_open span, -.dokuwiki .toc span.toc_close span { - display: none; + margin: 0 .2em; } -/* css arrow -.dokuwiki .toc span.toc_open, -.dokuwiki .toc span.toc_close { - border: .4em solid __background__; - float: right; - display: block; - margin: 0 .2em 0 0; -} -.dokuwiki .toc span.toc_open span, -.dokuwiki .toc span.toc_close span { - display: none; -} -.dokuwiki .toc span.toc_open { - margin-top: .4em; - border-top: .4em solid __text__; -} -.dokuwiki .toc span.toc_close { - margin-top: 0; - border-bottom: .4em solid __text__; -} -*/ - /*____________ toc list ____________*/ .dokuwiki #toc__inside { - font-size: 0.875em; - padding: .5em 1em 1em; + padding: .2em .5em; } .dokuwiki #toc__inside ul { - padding: 0 0 0 1.5em; + padding: 0; margin: 0; } .dokuwiki #toc__inside ul li { + list-style: none; padding: 0; margin: 0; + line-height: 1.1; +} +.dokuwiki #toc__inside ul li div.li { + padding: .15em 0; } .dokuwiki #toc__inside ul ul { padding-left: 1em; diff --git a/css/design.css b/css/design.css index b008f201c..ec6056df9 100755 --- a/css/design.css +++ b/css/design.css @@ -185,11 +185,8 @@ /* make sidebar more condensed */ -/* make h1 in sidebar ugly and small to prevent people using it */ #dokuwiki__aside h1 { - font-size: .7em; - color: green; - background-color: pink; + margin-bottom: .222em; } #dokuwiki__aside h2 { margin-bottom: .333em; @@ -289,6 +286,12 @@ line-height: 1.4; } +#acl__tree li { + margin: 0; +} + +/*____________ changes to _edit ____________*/ + .dokuwiki div.toolbar button.toolbutton { border-radius: 0; border-left-width: 0; @@ -320,8 +323,52 @@ div.picker button.toolbutton { } -#acl__tree li { - margin: 0; +/*____________ changes to _toc ____________*/ + +.dokuwiki div.toc { + margin: -2em -2em .5em 1.4em; + width: __sidebar_width__; + border-left: 1px solid __border__; + background: __background__; + color: inherit; +} + +.dokuwiki div.tocheader { + padding: .5em 1em; + margin-bottom: 0; + font-size: .875em; + letter-spacing: .1em; +} + +.dokuwiki .toc span.toc_open, +.dokuwiki .toc span.toc_close { + background: transparent url(images/toc-arrows.png) 0 0; + width: 8px; + height: 5px; + margin: .4em 0 0; +} +.dokuwiki .toc span.toc_open { + background-position: 0 -5px; +} + +.dokuwiki .toc span.toc_open span, +.dokuwiki .toc span.toc_close span { + display: none; +} + + +.dokuwiki #toc__inside { + font-size: 0.875em; + padding: .5em 1em 1em; +} +.dokuwiki #toc__inside ul { + padding: 0 0 0 1.5em; +} +.dokuwiki #toc__inside ul li { + list-style: disc; +} +.dokuwiki #toc__inside ul li div.li { + padding: .2em 0; } -- cgit v1.2.3 From 78393a7352790b824506fb7037b4ff3d5402234a Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Sun, 22 Jan 2012 13:41:07 +0000 Subject: fixed, completed and improved RTL styles (including styles for the pagetools and more) --- css/rtl.css | 360 +++++++++++++++++++++++++++++++++++++++++++----------------- 1 file changed, 260 insertions(+), 100 deletions(-) diff --git a/css/rtl.css b/css/rtl.css index 5b6fa28bb..2ac39fbb7 100755 --- a/css/rtl.css +++ b/css/rtl.css @@ -33,105 +33,6 @@ caption, legend { right: -9000px; } -/*____________ structure ____________*/ - -#dokuwiki__header .headings { - float: right; - text-align: right; -} -#dokuwiki__header .tools { - float: left; - text-align: left; -} - -#dokuwiki__aside { - float: right; -} -#dokuwiki__aside .pad { - margin: 0 0 0 1.5em; -} - -.hasSidebar #dokuwiki__content { - float: left; - margin-left: 0; - margin-right: -__sidebar_width__; -} -.hasSidebar #dokuwiki__content .pad { - margin-left: 0; - margin-right: __sidebar_width__; -} - -/*____________ design ____________*/ - -#dokuwiki__header h1 img { - float: right; - margin-left: .5em; - margin-right: 0; -} - -#dokuwiki__sitetools form.search input.edit { - padding: .35em .1em .35em 22px; -} -#dokuwiki__sitetools form.search input.button { - background-position: 5px 0; - margin-left: 0; - margin-right: -20px; -} - -#dokuwiki__usertools { - text-align: left; - left: 40px; - right: auto; -} - -#dokuwiki__sitetools { - text-align: left; -} - -#dokuwiki__aside ul, #dokuwiki__aside ol { - padding-right: 0; -} - -.dokuwiki .pageId { - right: auto; - left: -1em; -} - -.dokuwiki .docInfo { - text-align: left; -} - - -#dokuwiki__footer .license img { - margin: 0 0 0 .5em; -} - -/*____________ content ____________*/ - -/* section indenting -.dokuwiki .page h1 {margin-left: 0; margin-right: 0;} -.dokuwiki .page h2 {margin-left: 0; margin-right: .666em;} -.dokuwiki .page h3 {margin-left: 0; margin-right: 1.776em;} -.dokuwiki .page h4 {margin-left: 0; margin-right: 3em;} -.dokuwiki .page h5 {margin-left: 0; margin-right: 4.5712em;} -.dokuwiki .page div.level1 {margin-left: 0; margin-right: 0;} -.dokuwiki .page div.level2 {margin-left: 0; margin-right: 1em;} -.dokuwiki .page div.level3 {margin-left: 0; margin-right: 2em;} -.dokuwiki .page div.level4 {margin-left: 0; margin-right: 3em;} -.dokuwiki .page div.level5 {margin-left: 0; margin-right: 4em;} -*/ - -.dokuwiki dl.code dt, -.dokuwiki dl.file dt { - margin-left: 0; - margin-right: 1em; -} - -.JSpopup ul, -.JSpopup ol { - padding-right: 0; -} - /*____________ _imgdetail ____________*/ @@ -226,12 +127,12 @@ caption, legend { .dokuwiki .toc span.toc_open, .dokuwiki .toc span.toc_close { float: left; - margin: 0 0 0 .2em; } .dokuwiki #toc__inside ul ul { padding-left: 0; padding-right: 1em; } + .dokuwiki ul.idx { padding-right: 0; } @@ -283,6 +184,13 @@ caption, legend { float: left; } +.dokuwiki div.section_highlight { + margin: -3em -1.5em -.01em 0; + padding: 3em 1em .01em 0; + border-left-width: 0; + border-right: .5em solid __background_alt__; +} + /*____________ _modal ____________*/ @@ -334,3 +242,255 @@ form#subscribe__form fieldset { /*____________ includes ____________*/ +/*____________ structure ____________*/ + +#dokuwiki__header .headings { + float: right; + text-align: right; +} +#dokuwiki__header .tools { + float: left; + text-align: left; +} + +#dokuwiki__aside { + float: right; +} +#dokuwiki__aside .pad { + margin: 0 0 0 1.5em; +} + +.hasSidebar #dokuwiki__content { + float: left; + margin-left: 0; + margin-right: -__sidebar_width__; +} +.hasSidebar #dokuwiki__content .pad { + margin-left: 0; + margin-right: __sidebar_width__; +} + +/*____________ design ____________*/ + +#dokuwiki__header h1 img { + float: right; + margin-left: .5em; + margin-right: 0; +} + +#dokuwiki__sitetools form.search input.edit { + padding: .35em .1em .35em 22px; +} +#dokuwiki__sitetools form.search input.button { + background-position: 5px 0; + margin-left: 0; + margin-right: -20px; +} + +#dokuwiki__usertools { + text-align: left; + left: 40px; + right: auto; +} + +#dokuwiki__sitetools { + text-align: left; +} + +#dokuwiki__aside ul, #dokuwiki__aside ol { + padding-right: 0; +} + +.dokuwiki .pageId { + right: auto; + left: -1em; +} + +.dokuwiki .docInfo { + text-align: left; +} + +.dokuwiki div.toolbar button.toolbutton:first-child { + border-top-left-radius: 0; + border-bottom-left-radius: 0; + border-top-right-radius: 4px; + border-bottom-right-radius: 4px; + border-left-width: 0; + border-right-width: 1px; +} +.dokuwiki div.toolbar button.toolbutton:last-child { + border-top-left-radius: 4px; + border-bottom-left-radius: 4px; + border-top-right-radius: 0; + border-bottom-right-radius: 0; + border-left-width: 1px; +} + +.dokuwiki div.section_highlight { + margin-right: -2em; + border-right-width: 1em; +} + +#dokuwiki__footer .license img { + margin: 0 0 0 .5em; +} + +.dokuwiki div.toc { + margin: -2em 1.4em .5em -2em; + border-left-width: 0; + border-right: 1px solid __border__; +} +.dokuwiki #toc__inside ul { + padding: 0 1.5em 0 0; +} + +/*____________ pagetools ____________*/ + +#dokuwiki__usertools { + right: auto; + left: 40px; +} + +#dokuwiki__pagetools { + right: auto; + left: -40px; +} + +#dokuwiki__pagetools ul { + right: auto; + left: 0; + text-align: left; +} + +#dokuwiki__pagetools ul li a { + padding: 5px 5px 5px 40px; + background-position: left 0; +} + +#dokuwiki__pagetools:hover ul, +#dokuwiki__pagetools ul li a:focus { + box-shadow: -2px 2px 2px __text_alt__; +} + +/* all available icons in sprite */ +#dokuwiki__pagetools ul li a.edit { + background-position: left 0; +} +#dokuwiki__pagetools ul li a.edit:hover, +#dokuwiki__pagetools ul li a.edit:active, +#dokuwiki__pagetools ul li a.edit:focus { + background-position: left -45px; +} + +#dokuwiki__pagetools ul li a.create { + background-position: left -90px; +} +#dokuwiki__pagetools ul li a.create:hover, +#dokuwiki__pagetools ul li a.create:active, +#dokuwiki__pagetools ul li a.create:focus { + background-position: left -135px; +} + +#dokuwiki__pagetools ul li a.show { + background-position: left -270px; +} +#dokuwiki__pagetools ul li a.show:hover, +#dokuwiki__pagetools ul li a.show:active, +#dokuwiki__pagetools ul li a.show:focus { + background-position: left -315px; +} + +#dokuwiki__pagetools ul li a.source { + background-position: left -360px; +} +#dokuwiki__pagetools ul li a.source:hover, +#dokuwiki__pagetools ul li a.source:active, +#dokuwiki__pagetools ul li a.source:focus { + background-position: left -405px; +} + +#dokuwiki__pagetools ul li a.draft { + background-position: left -180px; +} +#dokuwiki__pagetools ul li a.draft:hover, +#dokuwiki__pagetools ul li a.draft:active, +#dokuwiki__pagetools ul li a.draft:focus { + background-position: left -225px; +} + +#dokuwiki__pagetools ul li a.revs { + background-position: left -540px; +} +#dokuwiki__pagetools ul li a.revs:hover, +#dokuwiki__pagetools ul li a.revs:active, +#dokuwiki__pagetools ul li a.revs:focus, +.mode_revisions #dokuwiki__pagetools ul li a.revs { + background-position: left -585px; +} + +#dokuwiki__pagetools ul li a.backlink { + background-position: left -630px; +} +#dokuwiki__pagetools ul li a.backlink:hover, +#dokuwiki__pagetools ul li a.backlink:active, +#dokuwiki__pagetools ul li a.backlink:focus, +.mode_backlink #dokuwiki__pagetools ul li a.backlink { + background-position: left -675px; +} + +#dokuwiki__pagetools ul li a.top { + background-position: left -810px; +} +#dokuwiki__pagetools ul li a.top:hover, +#dokuwiki__pagetools ul li a.top:active, +#dokuwiki__pagetools ul li a.top:focus { + background-position: left -855px; +} + +#dokuwiki__pagetools ul li a.revert { + background-position: left -450px; +} +#dokuwiki__pagetools ul li a.revert:hover, +#dokuwiki__pagetools ul li a.revert:active, +#dokuwiki__pagetools ul li a.revert:focus, +.mode_revert #dokuwiki__pagetools ul li a.revert { + background-position: left -495px; +} + +#dokuwiki__pagetools ul li a.subscribe { + background-position: left -720px; +} +#dokuwiki__pagetools ul li a.subscribe:hover, +#dokuwiki__pagetools ul li a.subscribe:active, +#dokuwiki__pagetools ul li a.subscribe:focus, +.mode_subscribe #dokuwiki__pagetools ul li a.subscribe { + background-position: left -765px; +} + + +/*____________ content ____________*/ + +/* section indenting +.dokuwiki .page h1 {margin-left: 0; margin-right: 0;} +.dokuwiki .page h2 {margin-left: 0; margin-right: .666em;} +.dokuwiki .page h3 {margin-left: 0; margin-right: 1.776em;} +.dokuwiki .page h4 {margin-left: 0; margin-right: 3em;} +.dokuwiki .page h5 {margin-left: 0; margin-right: 4.5712em;} +.dokuwiki .page div.level1 {margin-left: 0; margin-right: 0;} +.dokuwiki .page div.level2 {margin-left: 0; margin-right: 1em;} +.dokuwiki .page div.level3 {margin-left: 0; margin-right: 2em;} +.dokuwiki .page div.level4 {margin-left: 0; margin-right: 3em;} +.dokuwiki .page div.level5 {margin-left: 0; margin-right: 4em;} +*/ + +.dokuwiki dl.code dt, +.dokuwiki dl.file dt { + margin-left: 0; + margin-right: 1em; +} + +.JSpopup ul, +.JSpopup ol { + padding-right: 0; +} + -- cgit v1.2.3 From cda2580ff661910ab67da739608a7275a6f9f912 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Sun, 22 Jan 2012 14:04:07 +0000 Subject: moved pickerbutton styling to general _edit stylesheet --- css/_edit.css | 6 +++++- css/design.css | 6 ------ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/css/_edit.css b/css/_edit.css index 67f076914..3adbc1d96 100755 --- a/css/_edit.css +++ b/css/_edit.css @@ -35,8 +35,12 @@ div.picker { div.picker.pk_hl { width: auto; } + /* buttons inside of picker */ -div.picker button.pickerbutton { +div.picker button.pickerbutton, +div.picker button.toolbutton { + padding: .1em .35em; + border-width: 0; } /*____________ edit textarea ____________*/ diff --git a/css/design.css b/css/design.css index ec6056df9..1b596d590 100755 --- a/css/design.css +++ b/css/design.css @@ -307,12 +307,6 @@ border-bottom-right-radius: 4px; } -div.picker button.pickerbutton, -div.picker button.toolbutton { - padding: .1em .35em; - border-width: 0; -} - .dokuwiki div.section_highlight { margin-left: -2em; border-left-width: 1em; -- cgit v1.2.3 From 47d19ca23ed6d8396fab5062868bc847bfdd1ecf Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Sun, 22 Jan 2012 14:58:49 +0000 Subject: included lesser IEs than 7 into the rest of the conditional comments --- detail.php | 2 +- mediamanager.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/detail.php b/detail.php index baaebcbf7..91daf4db9 100755 --- a/detail.php +++ b/detail.php @@ -28,7 +28,7 @@ if (!defined('DOKU_INC')) die(); - +
      diff --git a/mediamanager.php b/mediamanager.php index 01e1b82ae..6a5f61592 100755 --- a/mediamanager.php +++ b/mediamanager.php @@ -26,7 +26,7 @@ if (!defined('DOKU_INC')) die(); - +
      -- cgit v1.2.3 From fc1d0a5b10210a22c8909f30661668d876e9583d Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Sun, 22 Jan 2012 15:00:36 +0000 Subject: added X-UA-Compatible to always use the best possible browser mode in IE and give users with Chrome Frame the chance to use it --- detail.php | 1 + main.php | 1 + mediamanager.php | 1 + 3 files changed, 3 insertions(+) diff --git a/detail.php b/detail.php index 91daf4db9..03f83a860 100755 --- a/detail.php +++ b/detail.php @@ -17,6 +17,7 @@ if (!defined('DOKU_INC')) die(); lang="" dir=""> + <?php echo hsc(tpl_img_getTag('IPTC.Headline',$IMG))?> [<?php echo strip_tags($conf['title'])?>] diff --git a/main.php b/main.php index 2a66d1df0..d843a18e4 100755 --- a/main.php +++ b/main.php @@ -19,6 +19,7 @@ $showSidebar = tpl_getConf('sidebarID') && page_exists(tpl_getConf('sidebarID')) lang="<?php echo $conf['lang'] ?>" dir="<?php echo $lang['direction'] ?>"> <head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> + <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" /> <title><?php tpl_pagetitle() ?> [<?php echo strip_tags($conf['title']) ?>] diff --git a/mediamanager.php b/mediamanager.php index 6a5f61592..f773c98e8 100755 --- a/mediamanager.php +++ b/mediamanager.php @@ -15,6 +15,7 @@ if (!defined('DOKU_INC')) die(); lang="" dir="" class="popup"> + <?php echo hsc($lang['mediaselect'])?> [<?php echo strip_tags($conf['title'])?>] -- cgit v1.2.3 From dd63cd2b93bfa75cc2c13a50047278aaa94f4c9a Mon Sep 17 00:00:00 2001 From: Anika Henke <anika@selfthinker.org> Date: Sun, 22 Jan 2012 15:58:03 +0000 Subject: integrated image detail page into main layout --- css/_imgdetail.css | 10 ++-- css/design.css | 6 +++ detail.php | 132 ++++++++++++++++++++++++++++++++--------------------- main.php | 79 +------------------------------- tpl_footer.php | 6 +++ tpl_header.php | 72 +++++++++++++++++++++++++++++ 6 files changed, 170 insertions(+), 135 deletions(-) create mode 100644 tpl_footer.php create mode 100644 tpl_header.php diff --git a/css/_imgdetail.css b/css/_imgdetail.css index d6cc4abaf..a3e0f55f5 100755 --- a/css/_imgdetail.css +++ b/css/_imgdetail.css @@ -8,14 +8,11 @@ #dokuwiki__detail h1 { } -#dokuwiki__detail div.content { -} - -#dokuwiki__detail div.content img { +#dokuwiki__detail img { float: left; - margin-right: 1.5em; + margin: 0 1.5em .5em 0; } -#dokuwiki__detail div.content div.img_detail { +#dokuwiki__detail div.img_detail { float: left; } @@ -29,4 +26,5 @@ } #dokuwiki__detail p.back { + clear: both; } diff --git a/css/design.css b/css/design.css index 1b596d590..026c5e3c0 100755 --- a/css/design.css +++ b/css/design.css @@ -366,6 +366,12 @@ } +/*____________ changes to _imgdetail ____________*/ + +#dokuwiki__detail { + padding: 0; +} + /*____________ JS popup ____________*/ .JSpopup { diff --git a/detail.php b/detail.php index 03f83a860..f3951e7bc 100755 --- a/detail.php +++ b/detail.php @@ -11,6 +11,8 @@ if (!defined('DOKU_INC')) die(); @require_once(dirname(__FILE__).'/tpl_functions.php'); /* include hook for template functions */ +$showTools = !tpl_getConf('hideTools') || ( tpl_getConf('hideTools') && $_SERVER['REMOTE_USER'] ); +$showSidebar = tpl_getConf('sidebarID') && page_exists(tpl_getConf('sidebarID')) && ($ACT=='show'); ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php echo $conf['lang']?>" @@ -29,70 +31,96 @@ if (!defined('DOKU_INC')) die(); </head> <body> + <?php /* with these Conditional Comments you can better address IE issues in CSS files, + precede CSS rules by #IE7 for IE7 and #IE8 for IE8 (div closes at the bottom) */ ?> <!--[if lte IE 7 ]><div id="IE7"><![endif]--><!--[if IE 8 ]><div id="IE8"><![endif]--> - <div id="dokuwiki__detail" class="dokuwiki"> - <?php html_msgarea() ?> - <?php if($ERROR){ print $ERROR; }else{ ?> + <?php /* the "dokuwiki__top" id is needed somewhere at the top, because that's where the "back to top" button/link links to */ ?> + <?php /* classes mode_<action> are added to make it possible to e.g. style a page differently if it's in edit mode, + see http://www.dokuwiki.org/devel:action_modes for a list of action modes */ ?> + <?php /* .dokuwiki should always be in one of the surrounding elements (e.g. plugins and templates depend on it) */ ?> + <div id="dokuwiki__site"><div id="dokuwiki__top" + class="dokuwiki site mode_<?php echo $ACT ?> <?php echo ($showSidebar) ? 'hasSidebar' : ''; ?>"> - <h1><?php echo hsc(tpl_img_getTag('IPTC.Headline',$IMG))?></h1> + <?php include('tpl_header.php') ?> - <div class="content"> - <?php tpl_img(900,700) ?> + <div class="wrapper group" id="dokuwiki__detail"> - <div class="img_detail"> - <h2><?php print nl2br(hsc(tpl_img_getTag('simple.title'))); ?></h2> + <!-- ********** CONTENT ********** --> + <div id="dokuwiki__content"><div class="pad group"> + <?php tpl_flush() /* flush the output buffer */ ?> + <?php _tpl_include('pageheader.html') ?> - <dl> - <?php - $config_files = getConfigFiles('mediameta'); - foreach ($config_files as $config_file) { - if(@file_exists($config_file)) { - include($config_file); - } - } + <!-- ********** IMG DETAIL ********** --> - foreach($fields as $key => $tag){ - $t = array(); - if (!empty($tag[0])) { - $t = array($tag[0]); - } - if(is_array($tag[3])) { - $t = array_merge($t,$tag[3]); + <?php if($ERROR){ print $ERROR; }else{ ?> + + <h1><?php echo hsc(tpl_img_getTag('IPTC.Headline',$IMG))?></h1> + + <?php tpl_img(900,700) ?> + + <div class="img_detail"> + <h2><?php print nl2br(hsc(tpl_img_getTag('simple.title'))); ?></h2> + + <dl> + <?php + $config_files = getConfigFiles('mediameta'); + foreach ($config_files as $config_file) { + if(@file_exists($config_file)) { + include($config_file); + } } - $value = tpl_img_getTag($t); - if ($value) { - echo '<dt>'.$lang[$tag[1]].':</dt><dd>'; - if ($tag[2] == 'date') { - echo dformat($value); - } else { - echo hsc($value); + + foreach($fields as $key => $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 '<dt>'.$lang[$tag[1]].':</dt><dd>'; + if ($tag[2] == 'date') { + echo dformat($value); + } else { + echo hsc($value); + } + echo '</dd>'; } - echo '</dd>'; } + ?> + </dl> + <?php //Comment in for Debug// dbg(tpl_img_getTag('Simple.Raw'));?> + </div> + + <p class="back"> + <?php + $imgNS = getNS($IMG); + $authNS = auth_quickaclcheck("$imgNS:*"); + if (($authNS >= AUTH_UPLOAD) && function_exists('media_managerURL')) { + $mmURL = media_managerURL(array('ns' => $imgNS, 'image' => $IMG)); + echo '<a href="'.$mmURL.'">'.$lang['img_manager'].'</a><br />'; } ?> - </dl> - <?php //Comment in for Debug// dbg(tpl_img_getTag('Simple.Raw'));?> - </div> - <div class="clearer"></div> - </div><!-- /.content --> - - <p class="back"> - <?php - $imgNS = getNS($IMG); - $authNS = auth_quickaclcheck("$imgNS:*"); - if (($authNS >= AUTH_UPLOAD) && function_exists('media_managerURL')) { - $mmURL = media_managerURL(array('ns' => $imgNS, 'image' => $IMG)); - echo '<a href="'.$mmURL.'">'.$lang['img_manager'].'</a><br />'; - } - ?> - ← <?php echo $lang['img_backto']?> <?php tpl_pagelink($ID)?> - </p> - - <?php } ?> - </div> + ← <?php echo $lang['img_backto']?> <?php tpl_pagelink($ID)?> + </p> + + <?php } ?> + + <!-- ********** /IMG DETAIL ********** --> + + <?php tpl_flush() ?> + <?php _tpl_include('pagefooter.html') ?> + </div></div><!-- /content --> + <hr class="a11y" /> + + </div><!-- /wrapper --> + + <?php include('tpl_footer.php') ?> + </div></div><!-- /site --> + <!--[if ( IE 6 | IE 7 | IE 8 ) ]></div><![endif]--> </body> </html> - diff --git a/main.php b/main.php index d843a18e4..5ec7f72d4 100755 --- a/main.php +++ b/main.php @@ -38,78 +38,8 @@ $showSidebar = tpl_getConf('sidebarID') && page_exists(tpl_getConf('sidebarID')) <?php /* .dokuwiki should always be in one of the surrounding elements (e.g. plugins and templates depend on it) */ ?> <div id="dokuwiki__site"><div id="dokuwiki__top" class="dokuwiki site mode_<?php echo $ACT ?> <?php echo ($showSidebar) ? 'hasSidebar' : ''; ?>"> - <?php html_msgarea() /* occasional error and info messages on top of the page */ ?> - <?php _tpl_include('header.html') ?> - - <!-- ********** HEADER ********** --> - <div id="dokuwiki__header"><div class="pad group"> - - <div class="headings group"> - <h1><?php tpl_link( - wl(), - '<img src="'.tpl_getFavicon(false, 'logo.png').'" width="64" height="64" alt="" /> <span>'.$conf['title'].'</span>', - 'accesskey="h" title="[H]"' - ) /* @todo: obviously don't use tpl_getFavicon, but make a new function (or use a config option?) */ ?></h1> - <?php if (tpl_getConf('tagline')): ?> - <p class="claim"><?php echo tpl_getConf('tagline') ?></p> - <?php endif ?> - - <ul class="a11y"> - <li><a href="#dokuwiki__content"><?php echo tpl_getLang('skip_to_content') ?></a></li> - </ul> - </div> - - <div class="tools group"> - <!-- USER TOOLS --> - <?php if ($conf['useacl'] && $showTools): ?> - <div id="dokuwiki__usertools"> - <h3 class="a11y"><?php echo tpl_getLang('user_tools') ?></h3> - <ul> - <?php /* the optional second parameter of tpl_action() switches between a link and a button, - e.g. a button inside a <li> would be: tpl_action('edit',0,'li') */ - if ($_SERVER['REMOTE_USER']) { - echo '<li class="user">'; - tpl_userinfo(); /* 'Logged in as ...' */ - echo '</li>'; - } - tpl_action('admin', 1, 'li'); - tpl_action('profile', 1, 'li'); - tpl_action('register', 1, 'li'); - tpl_action('login', 1, 'li'); - ?> - </ul> - </div> - <?php endif ?> - - <!-- SITE TOOLS --> - <div id="dokuwiki__sitetools"> - <h3 class="a11y"><?php echo tpl_getLang('site_tools') ?></h3> - <?php tpl_searchform() ?> - <ul> - <?php - tpl_action('recent', 1, 'li'); - tpl_action('media', 1, 'li'); - tpl_action('index', 1, 'li'); - ?> - </ul> - </div> - </div> - - <!-- BREADCRUMBS --> - <?php if($conf['breadcrumbs'] || $conf['youarehere']): ?> - <div class="breadcrumbs"> - <?php if($conf['youarehere']): ?> - <div class="youarehere"><?php tpl_youarehere() ?></div> - <?php endif ?> - <?php if($conf['breadcrumbs']): ?> - <div class="trace"><?php tpl_breadcrumbs() ?></div> - <?php endif ?> - </div> - <?php endif ?> - - <hr class="a11y" /> - </div></div><!-- /header --> + <?php include('tpl_header.php') ?> <div class="wrapper group"> @@ -161,12 +91,7 @@ $showSidebar = tpl_getConf('sidebarID') && page_exists(tpl_getConf('sidebarID')) <?php endif; ?> </div><!-- /wrapper --> - <!-- ********** FOOTER ********** --> - <div id="dokuwiki__footer"><div class="pad"> - <?php tpl_license('button') /* content license, parameters: img=*badge|button|0, imgonly=*0|1, return=*0|1 */ ?> - </div></div><!-- /footer --> - - <?php _tpl_include('footer.html') ?> + <?php include('tpl_footer.php') ?> </div></div><!-- /site --> <div class="no"><?php tpl_indexerWebBug() /* provide DokuWiki housekeeping, required in all templates */ ?></div> diff --git a/tpl_footer.php b/tpl_footer.php new file mode 100644 index 000000000..fcc9d21c7 --- /dev/null +++ b/tpl_footer.php @@ -0,0 +1,6 @@ +<!-- ********** FOOTER ********** --> +<div id="dokuwiki__footer"><div class="pad"> + <?php tpl_license('button') /* content license, parameters: img=*badge|button|0, imgonly=*0|1, return=*0|1 */ ?> +</div></div><!-- /footer --> + +<?php _tpl_include('footer.html') ?> diff --git a/tpl_header.php b/tpl_header.php new file mode 100644 index 000000000..d782c051a --- /dev/null +++ b/tpl_header.php @@ -0,0 +1,72 @@ +<?php html_msgarea() /* occasional error and info messages on top of the page */ ?> +<?php _tpl_include('header.html') ?> + +<!-- ********** HEADER ********** --> +<div id="dokuwiki__header"><div class="pad group"> + + <div class="headings group"> + <h1><?php tpl_link( + wl(), + '<img src="'.tpl_getFavicon(false, 'logo.png').'" width="64" height="64" alt="" /> <span>'.$conf['title'].'</span>', + 'accesskey="h" title="[H]"' + ) /* @todo: obviously don't use tpl_getFavicon, but make a new function (or use a config option?) */ ?></h1> + <?php if (tpl_getConf('tagline')): ?> + <p class="claim"><?php echo tpl_getConf('tagline') ?></p> + <?php endif ?> + + <ul class="a11y"> + <li><a href="#dokuwiki__content"><?php echo tpl_getLang('skip_to_content') ?></a></li> + </ul> + </div> + + <div class="tools group"> + <!-- USER TOOLS --> + <?php if ($conf['useacl'] && $showTools): ?> + <div id="dokuwiki__usertools"> + <h3 class="a11y"><?php echo tpl_getLang('user_tools') ?></h3> + <ul> + <?php /* the optional second parameter of tpl_action() switches between a link and a button, + e.g. a button inside a <li> would be: tpl_action('edit',0,'li') */ + if ($_SERVER['REMOTE_USER']) { + echo '<li class="user">'; + tpl_userinfo(); /* 'Logged in as ...' */ + echo '</li>'; + } + tpl_action('admin', 1, 'li'); + tpl_action('profile', 1, 'li'); + tpl_action('register', 1, 'li'); + tpl_action('login', 1, 'li'); + ?> + </ul> + </div> + <?php endif ?> + + <!-- SITE TOOLS --> + <div id="dokuwiki__sitetools"> + <h3 class="a11y"><?php echo tpl_getLang('site_tools') ?></h3> + <?php tpl_searchform() ?> + <ul> + <?php + tpl_action('recent', 1, 'li'); + tpl_action('media', 1, 'li'); + tpl_action('index', 1, 'li'); + ?> + </ul> + </div> + + </div> + + <!-- BREADCRUMBS --> + <?php if($conf['breadcrumbs'] || $conf['youarehere']): ?> + <div class="breadcrumbs"> + <?php if($conf['youarehere']): ?> + <div class="youarehere"><?php tpl_youarehere() ?></div> + <?php endif ?> + <?php if($conf['breadcrumbs']): ?> + <div class="trace"><?php tpl_breadcrumbs() ?></div> + <?php endif ?> + </div> + <?php endif ?> + + <hr class="a11y" /> +</div></div><!-- /header --> -- cgit v1.2.3 From 2caa12ed72baeed123085a7534c1961b7b381a91 Mon Sep 17 00:00:00 2001 From: Anika Henke <anika@selfthinker.org> Date: Sun, 22 Jan 2012 15:59:20 +0000 Subject: corrected bottom conditional comments --- detail.php | 2 +- main.php | 2 +- mediamanager.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/detail.php b/detail.php index f3951e7bc..96fb3c2e7 100755 --- a/detail.php +++ b/detail.php @@ -121,6 +121,6 @@ $showSidebar = tpl_getConf('sidebarID') && page_exists(tpl_getConf('sidebarID')) <?php include('tpl_footer.php') ?> </div></div><!-- /site --> - <!--[if ( IE 6 | IE 7 | IE 8 ) ]></div><![endif]--> + <!--[if ( IE lte 7 | IE 8 ) ]></div><![endif]--> </body> </html> diff --git a/main.php b/main.php index 5ec7f72d4..2616519a8 100755 --- a/main.php +++ b/main.php @@ -95,6 +95,6 @@ $showSidebar = tpl_getConf('sidebarID') && page_exists(tpl_getConf('sidebarID')) </div></div><!-- /site --> <div class="no"><?php tpl_indexerWebBug() /* provide DokuWiki housekeeping, required in all templates */ ?></div> - <!--[if ( IE 6 | IE 7 | IE 8 ) ]></div><![endif]--> + <!--[if ( IE lte 7 | IE 8 ) ]></div><![endif]--> </body> </html> diff --git a/mediamanager.php b/mediamanager.php index f773c98e8..975fd0780 100755 --- a/mediamanager.php +++ b/mediamanager.php @@ -43,6 +43,6 @@ if (!defined('DOKU_INC')) die(); <?php tpl_mediaContent() ?> </div></div> </div> - <!--[if ( IE 6 | IE 7 | IE 8 ) ]></div><![endif]--> + <!--[if ( IE lte 7 | IE 8 ) ]></div><![endif]--> </body> </html> -- cgit v1.2.3 From 59f3611b2f11fe1652befff8189787a1181a2f66 Mon Sep 17 00:00:00 2001 From: Anika Henke <anika@selfthinker.org> Date: Sun, 22 Jan 2012 16:39:01 +0000 Subject: removed 'view original' button from new media manager again (was added in b8a84c03) and made a link around the image instead, as that is a more minor change (as it should be during the RC phase) and is what was originally planned --- inc/media.php | 4 ++++ inc/template.php | 14 +++----------- lib/tpl/default/_mediamanager.css | 9 --------- 3 files changed, 7 insertions(+), 20 deletions(-) diff --git a/inc/media.php b/inc/media.php index 8ff0a7d14..c53e1f5fc 100644 --- a/inc/media.php +++ b/inc/media.php @@ -832,6 +832,7 @@ function media_preview($image, $auth, $rev=false, $meta=false) { $size = media_image_preview_size($image, $rev, $meta); if ($size) { + global $lang; echo '<div class="image">'; $more = array(); @@ -845,7 +846,10 @@ function media_preview($image, $auth, $rev=false, $meta=false) { $more['w'] = $size[0]; $more['h'] = $size[1]; $src = ml($image, $more); + + echo '<a href="'.$src.'" target="_blank" title="'.$lang['mediaview'].'">'; echo '<img src="'.$src.'" alt="" style="max-width: '.$size[0].'px;" />'; + echo '</a>'; echo '</div>'.NL; } diff --git a/inc/template.php b/inc/template.php index 9d1609fd3..024bf985c 100644 --- a/inc/template.php +++ b/inc/template.php @@ -970,9 +970,10 @@ function tpl_img($maxwidth=0,$maxheight=0,$link=true,$params=null){ * Default action for TPL_IMG_DISPLAY */ function _tpl_img_action($data, $param=NULL) { + global $lang; $p = buildAttributes($data['params']); - if($data['url']) print '<a href="'.hsc($data['url']).'">'; + if($data['url']) print '<a href="'.hsc($data['url']).'" title="'.$lang['mediaview'].'">'; print '<img '.$p.'/>'; if($data['url']) print '</a>'; return true; @@ -1202,16 +1203,7 @@ function tpl_mediaFileDetails($image, $rev){ media_tabs_details($image, $opened_tab); - echo '<div class="panelHeader">'; - - // view button - if($opened_tab === 'view'){ - $link = ml($image,array('rev'=>$rev),true); - echo ' <a href="'.$link.'" target="_blank"><img src="'.DOKU_BASE.'lib/images/magnifier.png" '. - 'alt="'.$lang['mediaview'].'" title="'.$lang['mediaview'].'" class="btn" /></a>'; - } - - echo '<h3>'; + echo '<div class="panelHeader"><h3>'; list($ext,$mime,$dl) = mimetype($image,false); $class = preg_replace('/[^_\-a-z0-9]+/i','_',$ext); $class = 'select mediafile mf_'.$class; diff --git a/lib/tpl/default/_mediamanager.css b/lib/tpl/default/_mediamanager.css index 9b1ece8d7..68fa2e97f 100644 --- a/lib/tpl/default/_mediamanager.css +++ b/lib/tpl/default/_mediamanager.css @@ -102,15 +102,6 @@ margin: 0 0 3px; } -#mediamanager__page .file .panelHeader h3 { - margin-right: 18px; -} - -#mediamanager__page .file .panelHeader img.btn { - float: right; - width: 16px; -} - #mediamanager__page .panelHeader form.options { float: right; margin-top: -3px; -- cgit v1.2.3 From 97b821da3c337c4a9a2158d16a0fb84b6540280c Mon Sep 17 00:00:00 2001 From: Anika Henke <anika@selfthinker.org> Date: Sun, 22 Jan 2012 16:43:53 +0000 Subject: tiny change to styling of fullscreen manager first heading --- css/_media_fullscreen.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/css/_media_fullscreen.css b/css/_media_fullscreen.css index 7ae17f73b..3bf48e9ec 100644 --- a/css/_media_fullscreen.css +++ b/css/_media_fullscreen.css @@ -10,7 +10,7 @@ /*____________ structure ____________*/ #mediamanager__page h1 { - margin: 0 0 .5em; + margin-bottom: .5em; } #mediamanager__page { -- cgit v1.2.3 From 5096b41b09017775c7a6ed337c4c01ce89909faf Mon Sep 17 00:00:00 2001 From: Anika Henke <anika@selfthinker.org> Date: Sun, 22 Jan 2012 16:45:22 +0000 Subject: added comment to explain tpl_img() params --- detail.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/detail.php b/detail.php index 96fb3c2e7..33d39f5f9 100755 --- a/detail.php +++ b/detail.php @@ -57,7 +57,7 @@ $showSidebar = tpl_getConf('sidebarID') && page_exists(tpl_getConf('sidebarID')) <h1><?php echo hsc(tpl_img_getTag('IPTC.Headline',$IMG))?></h1> - <?php tpl_img(900,700) ?> + <?php tpl_img(900,700); /* parameters: maximum width, maximum height (and more) */ ?> <div class="img_detail"> <h2><?php print nl2br(hsc(tpl_img_getTag('simple.title'))); ?></h2> -- cgit v1.2.3 From b05c7adf308045a6ff8214f148f3aa5b84a669c3 Mon Sep 17 00:00:00 2001 From: Anika Henke <anika@selfthinker.org> Date: Sun, 22 Jan 2012 19:46:33 +0000 Subject: added new (and partly old) bullets again for sitemap, toc and page list style --- css/content.css | 18 ++++++++++++++---- css/design.css | 4 ++-- images/bullet.png | Bin 302 -> 199 bytes images/closed.png | Bin 269 -> 165 bytes images/open.png | Bin 265 -> 174 bytes images/toc-bullet.png | Bin 0 -> 211 bytes 6 files changed, 16 insertions(+), 6 deletions(-) create mode 100644 images/toc-bullet.png diff --git a/css/content.css b/css/content.css index 555819749..a32f71464 100755 --- a/css/content.css +++ b/css/content.css @@ -39,12 +39,22 @@ } -/*____________ lists ____________ +/*____________ lists ____________*/ -.dokuwiki ul li { - list-style-image: url(images/bullet.png); +.dokuwiki #dokuwiki__content li { + font-weight: bold; + color: __text_alt__; } -*/ + +.dokuwiki #dokuwiki__content ul li { + list-style-type: square; +} + +.dokuwiki #dokuwiki__content li .li { + font-weight: normal; + color: __text__; +} + /*____________ tables ____________*/ diff --git a/css/design.css b/css/design.css index 026c5e3c0..aa2dab333 100755 --- a/css/design.css +++ b/css/design.css @@ -356,10 +356,10 @@ padding: .5em 1em 1em; } .dokuwiki #toc__inside ul { - padding: 0 0 0 1.5em; + padding: 0 0 0 1.2em; } .dokuwiki #toc__inside ul li { - list-style: disc; + list-style-image: url(images/toc-bullet.png); } .dokuwiki #toc__inside ul li div.li { padding: .2em 0; diff --git a/images/bullet.png b/images/bullet.png index 4d4b2b541..5da537443 100755 Binary files a/images/bullet.png and b/images/bullet.png differ diff --git a/images/closed.png b/images/closed.png index 4730fe829..3691ebc17 100755 Binary files a/images/closed.png and b/images/closed.png differ diff --git a/images/open.png b/images/open.png index 188d809ce..40ff129be 100755 Binary files a/images/open.png and b/images/open.png differ diff --git a/images/toc-bullet.png b/images/toc-bullet.png new file mode 100644 index 000000000..a6f0169c3 Binary files /dev/null and b/images/toc-bullet.png differ -- cgit v1.2.3 From f5341063c5112d628d46037f0b0768f50c4fb696 Mon Sep 17 00:00:00 2001 From: Anika Henke <anika@selfthinker.org> Date: Sun, 22 Jan 2012 20:02:17 +0000 Subject: try to improve general list styling --- css/basic.css | 2 +- css/content.css | 10 +++------- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/css/basic.css b/css/basic.css index b266f8036..b13986568 100755 --- a/css/basic.css +++ b/css/basic.css @@ -140,7 +140,7 @@ li li { font-size: 100%; } -ul { list-style: disc outside; } +ul { list-style: square outside; } ol { list-style: decimal outside; } ol ol { list-style-type: lower-alpha; } ol ol ol { list-style-type: upper-roman; } diff --git a/css/content.css b/css/content.css index a32f71464..b9f0cbbe4 100755 --- a/css/content.css +++ b/css/content.css @@ -41,17 +41,13 @@ /*____________ lists ____________*/ -.dokuwiki #dokuwiki__content li { - font-weight: bold; +.dokuwiki #dokuwiki__content ul li { color: __text_alt__; } - -.dokuwiki #dokuwiki__content ul li { - list-style-type: square; +.dokuwiki #dokuwiki__content ol li { + color: __text_neu__; } - .dokuwiki #dokuwiki__content li .li { - font-weight: normal; color: __text__; } -- cgit v1.2.3 From 5c3746a0719b70e063e0b050af04b1e0c9e0473a Mon Sep 17 00:00:00 2001 From: Anika Henke <anika@selfthinker.org> Date: Sun, 22 Jan 2012 20:14:04 +0000 Subject: improved pagetools on hover --- css/pagetools.css | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/css/pagetools.css b/css/pagetools.css index 81ed571d9..c7575542f 100644 --- a/css/pagetools.css +++ b/css/pagetools.css @@ -79,9 +79,14 @@ position: static; } +#dokuwiki__pagetools ul li a:hover, +#dokuwiki__pagetools ul li a:active, #dokuwiki__pagetools ul li a:focus { text-decoration: none; } +#dokuwiki__pagetools ul li a:hover { + background-color: __background_alt__; +} /* all available icons in sprite */ #dokuwiki__pagetools ul li a.edit { -- cgit v1.2.3 From 8efe1ae0342bea3467d4ced4169aabb2813362aa Mon Sep 17 00:00:00 2001 From: Anika Henke <anika@selfthinker.org> Date: Tue, 24 Jan 2012 00:36:49 +0000 Subject: improved image detail page (fixes #28) --- css/design.css | 21 ++++++++ css/pagetools.css | 18 +++++++ css/rtl.css | 29 ++++++++++ detail.php | 125 +++++++++++++++++++++++++------------------- images/pagetools-sprite.png | Bin 13032 -> 14139 bytes images/pagetools-sprite.xcf | Bin 30556 -> 34360 bytes images/pagetools.xcf | Bin 12934 -> 14630 bytes 7 files changed, 140 insertions(+), 53 deletions(-) diff --git a/css/design.css b/css/design.css index aa2dab333..2744d8e30 100755 --- a/css/design.css +++ b/css/design.css @@ -371,6 +371,27 @@ #dokuwiki__detail { padding: 0; } +#dokuwiki__detail img { + float: none; + margin-bottom: 1.4em; +} +#dokuwiki__detail div.img_detail { + float: none; +} + +#dokuwiki__detail div.img_detail dl { + overflow: hidden; +} +#dokuwiki__detail div.img_detail dl dt { + float: left; + width: 9em; + text-align: right; + clear: left; +} +#dokuwiki__detail div.img_detail dl dd { + margin-left: 9.5em; +} + /*____________ JS popup ____________*/ diff --git a/css/pagetools.css b/css/pagetools.css index c7575542f..8842a5bea 100644 --- a/css/pagetools.css +++ b/css/pagetools.css @@ -182,3 +182,21 @@ .mode_subscribe #dokuwiki__pagetools ul li a.subscribe { background-position: right -765px; } + +#dokuwiki__pagetools ul li a.mediaManager { + background-position: right -900px; +} +#dokuwiki__pagetools ul li a.mediaManager:hover, +#dokuwiki__pagetools ul li a.mediaManager:active, +#dokuwiki__pagetools ul li a.mediaManager:focus { + background-position: right -945px; +} + +#dokuwiki__pagetools ul li a.back { + background-position: right -990px; +} +#dokuwiki__pagetools ul li a.back:hover, +#dokuwiki__pagetools ul li a.back:active, +#dokuwiki__pagetools ul li a.back:focus { + background-position: right -1035px; +} diff --git a/css/rtl.css b/css/rtl.css index 2ac39fbb7..6478e01d8 100755 --- a/css/rtl.css +++ b/css/rtl.css @@ -344,6 +344,17 @@ form#subscribe__form fieldset { padding: 0 1.5em 0 0; } +#dokuwiki__detail div.img_detail dl dt { + float: right; + text-align: left; + clear: right; +} +#dokuwiki__detail div.img_detail dl dd { + margin-left: 0; + margin-right: 9.5em; +} + + /*____________ pagetools ____________*/ #dokuwiki__usertools { @@ -467,6 +478,24 @@ form#subscribe__form fieldset { background-position: left -765px; } +#dokuwiki__pagetools ul li a.mediaManager { + background-position: left -900px; +} +#dokuwiki__pagetools ul li a.mediaManager:hover, +#dokuwiki__pagetools ul li a.mediaManager:active, +#dokuwiki__pagetools ul li a.mediaManager:focus { + background-position: left -945px; +} + +#dokuwiki__pagetools ul li a.back { + background-position: left -990px; +} +#dokuwiki__pagetools ul li a.back:hover, +#dokuwiki__pagetools ul li a.back:active, +#dokuwiki__pagetools ul li a.back:focus { + background-position: left -1035px; +} + /*____________ content ____________*/ diff --git a/detail.php b/detail.php index 33d39f5f9..fa193c794 100755 --- a/detail.php +++ b/detail.php @@ -51,71 +51,90 @@ $showSidebar = tpl_getConf('sidebarID') && page_exists(tpl_getConf('sidebarID')) <?php tpl_flush() /* flush the output buffer */ ?> <?php _tpl_include('pageheader.html') ?> - <!-- ********** IMG DETAIL ********** --> - - <?php if($ERROR){ print $ERROR; }else{ ?> - - <h1><?php echo hsc(tpl_img_getTag('IPTC.Headline',$IMG))?></h1> - - <?php tpl_img(900,700); /* parameters: maximum width, maximum height (and more) */ ?> - - <div class="img_detail"> - <h2><?php print nl2br(hsc(tpl_img_getTag('simple.title'))); ?></h2> - - <dl> - <?php - $config_files = getConfigFiles('mediameta'); - foreach ($config_files as $config_file) { - if(@file_exists($config_file)) { - include($config_file); + <?php if(!$ERROR): ?> + <div class="pageId"><span><?php echo hsc(tpl_img_getTag('IPTC.Headline',$IMG)); ?></span></div> + <?php endif; ?> + + <div class="page group"> + <!-- detail start --> + <?php + if($ERROR): + echo '<h1>'.$ERROR.'</h1>'; + else: ?> + + <h1><?php echo nl2br(hsc(tpl_img_getTag('simple.title'))); ?></h1> + + <?php tpl_img(900,700); /* parameters: maximum width, maximum height (and more) */ ?> + + <div class="img_detail"> + <dl> + <?php + // @todo: logic should be transferred to backend + $config_files = getConfigFiles('mediameta'); + foreach ($config_files as $config_file) { + if(@file_exists($config_file)) { + include($config_file); + } } - } - foreach($fields as $key => $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 '<dt>'.$lang[$tag[1]].':</dt><dd>'; - if ($tag[2] == 'date') { - echo dformat($value); - } else { - echo hsc($value); + foreach($fields as $key => $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 '<dt>'.$lang[$tag[1]].':</dt><dd>'; + if ($tag[2] == 'date') { + echo dformat($value); + } else { + echo hsc($value); + } + echo '</dd>'; } - echo '</dd>'; } - } - ?> - </dl> + ?> + </dl> + </div> <?php //Comment in for Debug// dbg(tpl_img_getTag('Simple.Raw'));?> - </div> - - <p class="back"> - <?php - $imgNS = getNS($IMG); - $authNS = auth_quickaclcheck("$imgNS:*"); - if (($authNS >= AUTH_UPLOAD) && function_exists('media_managerURL')) { - $mmURL = media_managerURL(array('ns' => $imgNS, 'image' => $IMG)); - echo '<a href="'.$mmURL.'">'.$lang['img_manager'].'</a><br />'; - } - ?> - ← <?php echo $lang['img_backto']?> <?php tpl_pagelink($ID)?> - </p> - - <?php } ?> + <?php endif; ?> + </div> + <!-- detail stop --> - <!-- ********** /IMG DETAIL ********** --> + <?php /* doesn't make sense like this; @todo: maybe add tpl_imginfo()? + <div class="docInfo"><?php tpl_pageinfo(); ?></div> + */ ?> <?php tpl_flush() ?> <?php _tpl_include('pagefooter.html') ?> </div></div><!-- /content --> + <hr class="a11y" /> + <!-- PAGE ACTIONS --> + <?php if ($showTools && !$ERROR): ?> + <div id="dokuwiki__pagetools"> + <h3 class="a11y"><?php echo tpl_getLang('page_tools') ?></h3> + <div class="tools"> + <ul> + <?php // View in media manager; @todo: transfer logic to backend + $imgNS = getNS($IMG); + $authNS = auth_quickaclcheck("$imgNS:*"); + if (($authNS >= AUTH_UPLOAD) && function_exists('media_managerURL')) { + $mmURL = media_managerURL(array('ns' => $imgNS, 'image' => $IMG)); + echo '<li><a href="'.$mmURL.'" class="mediaManager"><span>'.$lang['img_manager'].'</span></a></li>'; + } + ?> + <?php // Back to [ID]; @todo: transfer logic to backend + echo '<li><a href="'.wl($ID).'" class="back"><span>'.$lang['img_backto'].' '.$ID.'</span></a></li>'; + ?> + </ul> + </div> + </div> + <?php endif; ?> </div><!-- /wrapper --> <?php include('tpl_footer.php') ?> diff --git a/images/pagetools-sprite.png b/images/pagetools-sprite.png index f34abdac5..b1a62cacb 100644 Binary files a/images/pagetools-sprite.png and b/images/pagetools-sprite.png differ diff --git a/images/pagetools-sprite.xcf b/images/pagetools-sprite.xcf index 4bb1d68f4..062dcae5d 100644 Binary files a/images/pagetools-sprite.xcf and b/images/pagetools-sprite.xcf differ diff --git a/images/pagetools.xcf b/images/pagetools.xcf index 759ae4841..980d20363 100644 Binary files a/images/pagetools.xcf and b/images/pagetools.xcf differ -- cgit v1.2.3 From 0192e710a9606c3e938efa815e7ed7cb4f9bc1e7 Mon Sep 17 00:00:00 2001 From: Anika Henke <anika@selfthinker.org> Date: Tue, 24 Jan 2012 00:39:46 +0000 Subject: fixed bottom conditional comments --- detail.php | 2 +- main.php | 2 +- mediamanager.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/detail.php b/detail.php index fa193c794..23e77530d 100755 --- a/detail.php +++ b/detail.php @@ -140,6 +140,6 @@ $showSidebar = tpl_getConf('sidebarID') && page_exists(tpl_getConf('sidebarID')) <?php include('tpl_footer.php') ?> </div></div><!-- /site --> - <!--[if ( IE lte 7 | IE 8 ) ]></div><![endif]--> + <!--[if ( lte IE 7 | IE 8 ) ]></div><![endif]--> </body> </html> diff --git a/main.php b/main.php index 2616519a8..7aa4748cb 100755 --- a/main.php +++ b/main.php @@ -95,6 +95,6 @@ $showSidebar = tpl_getConf('sidebarID') && page_exists(tpl_getConf('sidebarID')) </div></div><!-- /site --> <div class="no"><?php tpl_indexerWebBug() /* provide DokuWiki housekeeping, required in all templates */ ?></div> - <!--[if ( IE lte 7 | IE 8 ) ]></div><![endif]--> + <!--[if ( lte IE 7 | IE 8 ) ]></div><![endif]--> </body> </html> diff --git a/mediamanager.php b/mediamanager.php index 975fd0780..d7d88f936 100755 --- a/mediamanager.php +++ b/mediamanager.php @@ -43,6 +43,6 @@ if (!defined('DOKU_INC')) die(); <?php tpl_mediaContent() ?> </div></div> </div> - <!--[if ( IE lte 7 | IE 8 ) ]></div><![endif]--> + <!--[if ( lte IE 7 | IE 8 ) ]></div><![endif]--> </body> </html> -- cgit v1.2.3 From c51f90d7a072929e2b636e986b8ea2121bc5a630 Mon Sep 17 00:00:00 2001 From: Dominik Eckelmann <eckelmann@cosmocode.de> Date: Tue, 24 Jan 2012 11:12:44 +0100 Subject: let js.php use multiple caches --- lib/exe/js.php | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/lib/exe/js.php b/lib/exe/js.php index b7f2fd222..c929c9ba5 100644 --- a/lib/exe/js.php +++ b/lib/exe/js.php @@ -31,8 +31,14 @@ function js_out(){ global $lang; global $config_cascade; + if (isset($_GET['cacheKey'])) { + $cacheKey = strval($_GET['cacheKey']); + } else { + $cacheKey = ''; + } + // The generated script depends on some dynamic options - $cache = new cache('scripts'.$_SERVER['HTTP_HOST'].$_SERVER['SERVER_PORT'], + $cache = new cache('scripts'.$_SERVER['HTTP_HOST'].$_SERVER['SERVER_PORT'].$cacheKey, '.js'); // load minified version for some files -- cgit v1.2.3 From 6d06b26afab712379b6d070a816f0c71cc76753b Mon Sep 17 00:00:00 2001 From: Dominik Eckelmann <eckelmann@cosmocode.de> Date: Tue, 24 Jan 2012 14:30:34 +0100 Subject: added INIT_LANG_LOAD event --- inc/init.php | 28 ++++++++++++++++++---------- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/inc/init.php b/inc/init.php index 14660b8d0..130746f20 100644 --- a/inc/init.php +++ b/inc/init.php @@ -69,16 +69,6 @@ foreach (array('default','local','protected') as $config_group) { } } -//prepare language array -global $lang; -$lang = array(); - -//load the language files -require_once(DOKU_INC.'inc/lang/en/lang.php'); -if ( $conf['lang'] && $conf['lang'] != 'en' ) { - require_once(DOKU_INC.'inc/lang/'.$conf['lang'].'/lang.php'); -} - //prepare license array() global $license; $license = array(); @@ -214,6 +204,10 @@ $plugin_controller = new $plugin_controller_class(); global $EVENT_HANDLER; $EVENT_HANDLER = new Doku_Event_Handler(); +$local = $conf['lang']; +trigger_event('INIT_LANG_LOAD', $local, 'init_lang', true); + + // setup authentication system if (!defined('NOSESSION')) { auth_setup(); @@ -256,6 +250,20 @@ function init_paths(){ $conf['media_changelog'] = $conf['metadir'].'/_media.changes'; } +function init_lang($langCode) { + //prepare language array + global $lang; + $lang = array(); + + //load the language files + require_once(DOKU_INC.'inc/lang/en/lang.php'); + if ($langCode && $langCode != 'en') { + if (file_exists(DOKU_INC."inc/lang/$langCode/lang.php")) { + require_once(DOKU_INC."inc/lang/$langCode/lang.php"); + } + } +} + /** * Checks the existance of certain files and creates them if missing. */ -- cgit v1.2.3 From c2790ba28b0df3773b54f78e37ac8ce0ada61cee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Emanuel-Emeric=20Andra=C8=99i?= <em.andrasi@mandrivausers.ro> Date: Wed, 25 Jan 2012 20:03:56 +0100 Subject: Romanian language update --- inc/lang/ro/lang.php | 1 + lib/plugins/acl/lang/ro/lang.php | 1 + lib/plugins/config/lang/ro/lang.php | 2 ++ lib/plugins/plugin/lang/ro/lang.php | 1 + lib/plugins/popularity/lang/ro/lang.php | 1 + lib/plugins/revert/lang/ro/lang.php | 1 + lib/plugins/usermanager/lang/ro/lang.php | 1 + 7 files changed, 8 insertions(+) diff --git a/inc/lang/ro/lang.php b/inc/lang/ro/lang.php index 0275b30f3..96a3d7970 100644 --- a/inc/lang/ro/lang.php +++ b/inc/lang/ro/lang.php @@ -8,6 +8,7 @@ * @author Emanuel-Emeric Andrași <n30@mandrivausers.ro> * @author Emanuel-Emeric Andraşi <em.andrasi@mandrivausers.ro> * @author Marius OLAR <olarmariusalex@gmail.com> + * @author Emanuel-Emeric Andrași <em.andrasi@mandrivausers.ro> */ $lang['encoding'] = 'utf-8'; $lang['direction'] = 'ltr'; diff --git a/lib/plugins/acl/lang/ro/lang.php b/lib/plugins/acl/lang/ro/lang.php index 0c13d7223..6d63ad024 100644 --- a/lib/plugins/acl/lang/ro/lang.php +++ b/lib/plugins/acl/lang/ro/lang.php @@ -9,6 +9,7 @@ * @author Emanuel-Emeric Andraşi <em.andrasi@mandrivausers.ro> * @author Emanuel-Emeric Andrasi <em.andrasi@mandrivausers.ro> * @author Marius OLAR <olarmariusalex@gmail.com> + * @author Emanuel-Emeric Andrași <em.andrasi@mandrivausers.ro> */ $lang['admin_acl'] = 'Managementul Listei de Control a Accesului'; $lang['acl_group'] = 'Grup'; diff --git a/lib/plugins/config/lang/ro/lang.php b/lib/plugins/config/lang/ro/lang.php index 6b0a0e91a..5845e3c35 100644 --- a/lib/plugins/config/lang/ro/lang.php +++ b/lib/plugins/config/lang/ro/lang.php @@ -9,6 +9,7 @@ * @author Emanuel-Emeric Andraşi <em.andrasi@mandrivausers.ro> * @author Emanuel-Emeric Andrasi <em.andrasi@mandrivausers.ro> * @author Marius OLAR <olarmariusalex@gmail.com> + * @author Emanuel-Emeric Andrași <em.andrasi@mandrivausers.ro> */ $lang['menu'] = 'Setări de Configurare'; $lang['error'] = 'Setări nu au fost actualizate datorită unei valori incorecte; verificaţi modificările şi încercaţi din nou. <br /> Valorile incorecte vor apărea într-un chenar roşu.'; @@ -67,6 +68,7 @@ $lang['useheading'] = 'Foloseşte primul titlu pentru numele paginii' $lang['refcheck'] = 'Verificare referinţă media'; $lang['refshow'] = 'Numărul de referinţe media de arătat'; $lang['allowdebug'] = 'Permite depanarea <b>dezactivaţi dacă cu e necesar!</b>'; +$lang['mediarevisions'] = 'Activează revizii media?'; $lang['usewordblock'] = 'Blochează spam-ul pe baza listei de cuvinte'; $lang['indexdelay'] = 'Timpul de întârziere înainte de indexare (sec)'; $lang['relnofollow'] = 'Folosiţi rel="nofollow" pentru legăturile externe'; diff --git a/lib/plugins/plugin/lang/ro/lang.php b/lib/plugins/plugin/lang/ro/lang.php index 9c90f77a3..798ada1c7 100644 --- a/lib/plugins/plugin/lang/ro/lang.php +++ b/lib/plugins/plugin/lang/ro/lang.php @@ -9,6 +9,7 @@ * @author Emanuel-Emeric Andraşi <em.andrasi@mandrivausers.ro> * @author Emanuel-Emeric Andrasi <em.andrasi@mandrivausers.ro> * @author Marius OLAR <olarmariusalex@gmail.com> + * @author Emanuel-Emeric Andrași <em.andrasi@mandrivausers.ro> */ $lang['menu'] = 'Administrează plugin-uri'; $lang['download'] = 'Descarcă şi instalează un nou plugin'; diff --git a/lib/plugins/popularity/lang/ro/lang.php b/lib/plugins/popularity/lang/ro/lang.php index 7f3508362..f3ca8d37e 100644 --- a/lib/plugins/popularity/lang/ro/lang.php +++ b/lib/plugins/popularity/lang/ro/lang.php @@ -7,6 +7,7 @@ * @author Emanuel-Emeric Andraşi <em.andrasi@mandrivausers.ro> * @author Emanuel-Emeric Andrasi <em.andrasi@mandrivausers.ro> * @author Marius OLAR <olarmariusalex@gmail.com> + * @author Emanuel-Emeric Andrași <em.andrasi@mandrivausers.ro> */ $lang['name'] = 'Feedback de popularitate (încărcarea poate dura mai mult)'; $lang['submit'] = 'Trimite datele'; diff --git a/lib/plugins/revert/lang/ro/lang.php b/lib/plugins/revert/lang/ro/lang.php index 7397a1d74..094f4dc71 100644 --- a/lib/plugins/revert/lang/ro/lang.php +++ b/lib/plugins/revert/lang/ro/lang.php @@ -9,6 +9,7 @@ * @author Emanuel-Emeric Andraşi <em.andrasi@mandrivausers.ro> * @author Emanuel-Emeric Andrasi <em.andrasi@mandrivausers.ro> * @author Marius OLAR <olarmariusalex@gmail.com> + * @author Emanuel-Emeric Andrași <em.andrasi@mandrivausers.ro> */ $lang['menu'] = 'Manager Reveniri'; $lang['filter'] = 'Caută pagini cu posibil spam'; diff --git a/lib/plugins/usermanager/lang/ro/lang.php b/lib/plugins/usermanager/lang/ro/lang.php index 4c0afc896..b8c1f24fc 100644 --- a/lib/plugins/usermanager/lang/ro/lang.php +++ b/lib/plugins/usermanager/lang/ro/lang.php @@ -9,6 +9,7 @@ * @author Emanuel-Emeric Andraşi <em.andrasi@mandrivausers.ro> * @author Emanuel-Emeric Andrasi <em.andrasi@mandrivausers.ro> * @author Marius OLAR <olarmariusalex@gmail.com> + * @author Emanuel-Emeric Andrași <em.andrasi@mandrivausers.ro> */ $lang['menu'] = 'Manager Utilizatori'; $lang['noauth'] = '(autentificarea utilizatorilor nu este disponibilă)'; -- cgit v1.2.3 From 5371328c2ade9ee2c2e09db62992fe4cfaadbbf1 Mon Sep 17 00:00:00 2001 From: Andreas Gohr <andi@splitbrain.org> Date: Wed, 25 Jan 2012 20:22:25 +0100 Subject: release preparations --- doku.php | 2 +- install.php | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/doku.php b/doku.php index e23757298..e699c818b 100644 --- a/doku.php +++ b/doku.php @@ -7,7 +7,7 @@ */ // update message version -$updateVersion = 35; +$updateVersion = 36; // xdebug_start_profiling(); diff --git a/install.php b/install.php index 03a026028..61db2be9f 100644 --- a/install.php +++ b/install.php @@ -49,6 +49,7 @@ $dokuwiki_hash = array( '2010-11-07' => '7921d48195f4db21b8ead6d9bea801b8', '2011-05-25' => '4241865472edb6fa14a1227721008072', '2011-11-10' => 'b46ff19a7587966ac4df61cbab1b8b31', + '2012-01-25' => '72c083c73608fc43c586901fd5dabb74', ); -- cgit v1.2.3 From 4e06fea2fb33898717a689daf73b36460c8796d7 Mon Sep 17 00:00:00 2001 From: Anika Henke <anika@selfthinker.org> Date: Fri, 27 Jan 2012 00:32:09 +0000 Subject: fixed some inputs inheriting bold font-weight (fixes #30) --- css/basic.css | 1 + 1 file changed, 1 insertion(+) diff --git a/css/basic.css b/css/basic.css index b13986568..cfff7dd97 100755 --- a/css/basic.css +++ b/css/basic.css @@ -301,6 +301,7 @@ select, optgroup, option { font: inherit; + font-weight: normal; color: #333; background-color: #fff; line-height: 1; -- cgit v1.2.3 From 82459785189c2ebdc462873f4096a66e6534b7f9 Mon Sep 17 00:00:00 2001 From: Anika Henke <anika@selfthinker.org> Date: Fri, 27 Jan 2012 00:38:14 +0000 Subject: moved msgarea further down to avoid clash with the user tools --- tpl_header.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tpl_header.php b/tpl_header.php index d782c051a..5d49f125d 100644 --- a/tpl_header.php +++ b/tpl_header.php @@ -1,9 +1,9 @@ -<?php html_msgarea() /* occasional error and info messages on top of the page */ ?> -<?php _tpl_include('header.html') ?> - <!-- ********** HEADER ********** --> <div id="dokuwiki__header"><div class="pad group"> + <?php html_msgarea() /* occasional error and info messages on top of the page */ ?> + <?php _tpl_include('header.html') ?> + <div class="headings group"> <h1><?php tpl_link( wl(), -- cgit v1.2.3 From 5583cf54d3705c259c9d1ff08323043bff59db42 Mon Sep 17 00:00:00 2001 From: Anika Henke <anika@selfthinker.org> Date: Fri, 27 Jan 2012 01:08:44 +0000 Subject: improved header in print styles --- css/print.css | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/css/print.css b/css/print.css index 9171bc9ae..d20d0f464 100755 --- a/css/print.css +++ b/css/print.css @@ -116,6 +116,10 @@ div.clearer { #dokuwiki__header h1 a { text-decoration: none; } +#dokuwiki__header h1 img { + float: left; + margin-right: .5em; +} .dokuwiki div.footnotes { clear: both; border-top: 1pt solid #000; -- cgit v1.2.3 From ff5df3c181b832ef5dba52deb372447b3b3c9bfb Mon Sep 17 00:00:00 2001 From: Anika Henke <anika@selfthinker.org> Date: Sun, 29 Jan 2012 12:02:51 +0000 Subject: have new section highlighting on both sides (fixes #33) and improve preview borders --- css/_edit.css | 9 +++++---- css/design.css | 10 ++++++++-- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/css/_edit.css b/css/_edit.css index 3adbc1d96..5a3952c90 100755 --- a/css/_edit.css +++ b/css/_edit.css @@ -99,7 +99,7 @@ div.picker button.toolbutton { ********************************************************************/ .dokuwiki div.preview { - border: dashed __border__; + border: dotted __border__; border-width: .2em 0; padding: 1.4em 0; margin-bottom: 1.4em; @@ -121,7 +121,8 @@ div.picker button.toolbutton { } /* style for section highlighting (only sections below headings) */ .dokuwiki div.section_highlight { - margin: -3em 0 -.01em -1.5em; - padding: 3em 0 .01em 1em; - border-left: .5em solid __background_alt__; + margin: -3em -1em -.01em -1em; /* negative side margin = side padding + side border */ + padding: 3em .5em .01em .5em; + border: solid __background_alt__; + border-width: 0 .5em; } diff --git a/css/design.css b/css/design.css index 2744d8e30..9718d2879 100755 --- a/css/design.css +++ b/css/design.css @@ -308,14 +308,20 @@ } .dokuwiki div.section_highlight { - margin-left: -2em; - border-left-width: 1em; + margin: -3em -2em -.01em -2em; + padding: 3em 1em .01em 1em; + border-width: 0 1em; } .dokuwiki textarea.edit { font-family: Consolas, "Andale Mono WT", "Andale Mono", "Bitstream Vera Sans Mono", "Liberation Mono", Monaco, "Courier New", monospace; } +.dokuwiki div.preview { + margin: 0 -2em; + padding: 2em; +} + /*____________ changes to _toc ____________*/ -- cgit v1.2.3 From 0a76802b3644673ece895e24ba708fc7e1f5ee76 Mon Sep 17 00:00:00 2001 From: Anika Henke <anika@selfthinker.org> Date: Sun, 29 Jan 2012 16:04:44 +0000 Subject: added mobile styles (#26), main work done, but some things still to follow --- css/design.css | 7 +++ css/mobile.css | 164 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ css/rtl.css | 59 ++++++++++++++++++--- style.ini | 1 + tpl_header.php | 14 +++-- 5 files changed, 233 insertions(+), 12 deletions(-) create mode 100644 css/mobile.css diff --git a/css/design.css b/css/design.css index 9718d2879..a6e52f16f 100755 --- a/css/design.css +++ b/css/design.css @@ -85,6 +85,9 @@ text-overflow: ellipsis; } +#dokuwiki__header .mobileTools { + display: none; /* hide mobile tools dropdown to only show in mobile view */ +} /*____________ user tools ____________*/ @@ -233,6 +236,10 @@ /* content ********************************************************************/ +#dokuwiki__content { + position: relative; +} + .dokuwiki .pageId { position: absolute; top: -2.3em; diff --git a/css/mobile.css b/css/mobile.css new file mode 100644 index 000000000..c54c28473 --- /dev/null +++ b/css/mobile.css @@ -0,0 +1,164 @@ +/** + * This file provides styles for mobile devices + * and smaller screens (up to 480px width). + * + * @author Anika Henke <anika@selfthinker.org> + */ + +@media only screen and (max-width: 480px), only screen and (max-device-width: 480px) { + + +/*____________ structure ____________*/ + +#dokuwiki__site { + max-width: 100%; +} +#dokuwiki__site .site { + padding: 0 .5em; +} +#dokuwiki__header { + padding: .5em 0; +} + +#dokuwiki__aside { + width: 100%; + float: none; +} +#dokuwiki__aside .pad { + margin: 0; +} + +.hasSidebar #dokuwiki__content { + float: none; + margin-left: 0; + width: 100%; +} +.hasSidebar #dokuwiki__content .pad { + margin-left: 0; +} + + +/*____________ header ____________*/ + +#dokuwiki__header ul.a11y.skip { + position: static !important; + left: 0 !important; + width: auto !important; + height: auto !important; + float: right; + font-size: 0.875em; + list-style: none; + padding-left: 0; + margin: 0; +} +#dokuwiki__header ul.a11y.skip li { + margin-left: .35em; + display: inline; +} + +#dokuwiki__header .headings, +#dokuwiki__header .tools { + float: none; + text-align: left; + width: auto; + margin-bottom: .5em; +} +#dokuwiki__sitetools { + text-align: left; +} +#dokuwiki__usertools, +#dokuwiki__sitetools ul, +#dokuwiki__sitetools h3, +#dokuwiki__pagetools, +.dokuwiki div.breadcrumbs, /* @todo: maybe move breadcrumbs to the bottom? */ +.dokuwiki .pageId { + display: none; +} + +/* search form */ +#dokuwiki__sitetools form.search { + float: left; + margin: 0 .2em .2em 0; + width: 49%; + position: relative; +} +#dokuwiki__sitetools form.search input.edit { + width: 90% !important; +} +#dokuwiki__sitetools form.search input.button { + position: absolute; + top: .2em; + right: .2em; +} +.dokuwiki form.search div.ajax_qsearch { + display: none !important; +} + +/* action dropdown is alternative for all hidden tools */ +#dokuwiki__header .mobileTools { + display: block; + font-size: 0.875em; + margin: 0 0 .2em 0; + float: right; + width: 49%; +} +#dokuwiki__header .mobileTools select { + padding: .25em .1em; + width: 100% !important; +} + + +/*____________ content ____________*/ + +.dokuwiki div.page { + padding: .5em; +} + +h1 { + margin-top: 0; +} + +/* toc */ +.dokuwiki div.toc { + float: none; + margin: 0 0 1em 0; + width: auto; + border-left-width: 0; + border-bottom: 1px solid __border__; +} +.dokuwiki div.tocheader { + padding: 0 0 .5em; +} +.dokuwiki #toc__inside { + padding: .2em 0 .5em; +} + +/* form elements */ +#config__manager fieldset td.value, +#config__manager td .input, +.dokuwiki fieldset, +.dokuwiki input.edit, +.dokuwiki textarea, +.dokuwiki select { + width: auto !important; + max-width: 100% !important; +} +#config__manager fieldset { + margin-left: 0; + margin-right: 0; +} + +/* _edit */ +.dokuwiki div.section_highlight { + margin: 0; + padding: 0; + border-width: 0; +} +.dokuwiki div.preview { + margin: 0 -.5em; + padding: .5em; +} + + + +} /* /@media */ diff --git a/css/rtl.css b/css/rtl.css index 6478e01d8..e073acba3 100755 --- a/css/rtl.css +++ b/css/rtl.css @@ -184,13 +184,6 @@ caption, legend { float: left; } -.dokuwiki div.section_highlight { - margin: -3em -1.5em -.01em 0; - padding: 3em 1em .01em 0; - border-left-width: 0; - border-right: .5em solid __background_alt__; -} - /*____________ _modal ____________*/ @@ -523,3 +516,55 @@ form#subscribe__form fieldset { padding-right: 0; } + +/*____________ mobile ____________*/ + +@media only screen and (max-width: 480px), only screen and (max-device-width: 480px) { + + +.hasSidebar #dokuwiki__content, +.hasSidebar #dokuwiki__content .pad { + margin-right: 0; +} + +#dokuwiki__header ul.a11y.skip { + left: auto !important; + right: 0 !important; + float: left; + padding-right: 0; +} +#dokuwiki__header ul.a11y.skip li { + margin: 0 .35em 0 0; +} + +#dokuwiki__header .headings, +#dokuwiki__header .tools { + float: none; + text-align: right; + width: auto; +} +#dokuwiki__sitetools { + text-align: right; +} + +#dokuwiki__sitetools form.search { + float: right; + margin: 0 0 .2em .2em; +} +#dokuwiki__sitetools form.search input.button { + right: auto; + left: .2em; +} + +#dokuwiki__header .mobileTools { + float: left; +} + +.dokuwiki div.toc { + float: none; + margin: 0 0 1em 0; + border-right-width: 0; +} + + +} /* /@media */ diff --git a/style.ini b/style.ini index d1e3b6c8e..bbf348dde 100755 --- a/style.ini +++ b/style.ini @@ -29,6 +29,7 @@ css/design.css = screen css/pagetools.css = screen css/content.css = screen css/includes.css = screen +css/mobile.css = screen css/rtl.css = rtl css/print.css = print diff --git a/tpl_header.php b/tpl_header.php index 5d49f125d..40094e30e 100644 --- a/tpl_header.php +++ b/tpl_header.php @@ -5,6 +5,10 @@ <?php _tpl_include('header.html') ?> <div class="headings group"> + <ul class="a11y skip"> + <li><a href="#dokuwiki__content"><?php echo tpl_getLang('skip_to_content') ?></a></li> + </ul> + <h1><?php tpl_link( wl(), '<img src="'.tpl_getFavicon(false, 'logo.png').'" width="64" height="64" alt="" /> <span>'.$conf['title'].'</span>', @@ -13,10 +17,6 @@ <?php if (tpl_getConf('tagline')): ?> <p class="claim"><?php echo tpl_getConf('tagline') ?></p> <?php endif ?> - - <ul class="a11y"> - <li><a href="#dokuwiki__content"><?php echo tpl_getLang('skip_to_content') ?></a></li> - </ul> </div> <div class="tools group"> @@ -44,7 +44,11 @@ <!-- SITE TOOLS --> <div id="dokuwiki__sitetools"> <h3 class="a11y"><?php echo tpl_getLang('site_tools') ?></h3> - <?php tpl_searchform() ?> + <?php tpl_searchform(); ?> + <?php /* all the tools in one dropdown (good for mobile view): */ ?> + <div class="mobileTools"> + <?php tpl_actiondropdown('Tools'); /* @todo: lang */ ?> + </div> <ul> <?php tpl_action('recent', 1, 'li'); -- cgit v1.2.3 From 085be412d466116395b586a8ff6d544858028ce7 Mon Sep 17 00:00:00 2001 From: Anika Henke <anika@selfthinker.org> Date: Sun, 29 Jan 2012 16:07:13 +0000 Subject: added comment header to pagetools.css --- css/pagetools.css | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/css/pagetools.css b/css/pagetools.css index 8842a5bea..a25032f0b 100644 --- a/css/pagetools.css +++ b/css/pagetools.css @@ -1,5 +1,10 @@ - -/*____________ page tools ____________*/ +/** + * This file provides the styles for the page tools + * (fly out navigation beside the page to edit, etc). + * + * @author Anika Henke <anika@selfthinker.org> + * @author Andreas Gohr <andi@splitbrain.org> + */ #dokuwiki__site .site { /* give space to the right so the tools won't disappear on smaller screens */ @@ -88,7 +93,8 @@ background-color: __background_alt__; } -/* all available icons in sprite */ +/*____________ all available icons in sprite ____________*/ + #dokuwiki__pagetools ul li a.edit { background-position: right 0; } -- cgit v1.2.3 From 5f5ad8229ff902545a65bd2714fbdd35a50d3696 Mon Sep 17 00:00:00 2001 From: Anika Henke <anika@selfthinker.org> Date: Sun, 29 Jan 2012 16:20:00 +0000 Subject: made changes to content list style also work in sidebar --- css/content.css | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/css/content.css b/css/content.css index b9f0cbbe4..626ad7727 100755 --- a/css/content.css +++ b/css/content.css @@ -41,13 +41,16 @@ /*____________ lists ____________*/ -.dokuwiki #dokuwiki__content ul li { +.dokuwiki #dokuwiki__content ul li, +.dokuwiki #dokuwiki__aside ul li { color: __text_alt__; } -.dokuwiki #dokuwiki__content ol li { +.dokuwiki #dokuwiki__content ol li, +.dokuwiki #dokuwiki__aside ol li { color: __text_neu__; } -.dokuwiki #dokuwiki__content li .li { +.dokuwiki #dokuwiki__content li .li, +.dokuwiki #dokuwiki__aside li .li { color: __text__; } -- cgit v1.2.3 From 99bdbaae72368d9ae3274f2ede2741301abca330 Mon Sep 17 00:00:00 2001 From: Anika Henke <anika@selfthinker.org> Date: Sun, 29 Jan 2012 16:22:01 +0000 Subject: removed old comments for headings --- css/basic.css | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/css/basic.css b/css/basic.css index cfff7dd97..bf2f22f75 100755 --- a/css/basic.css +++ b/css/basic.css @@ -53,21 +53,10 @@ legend { h1 { font-size: 2em; margin: -.222em 0 0.444em; - /*2 lines below makes ascenders of h1 be at the top of block - line-height: 0.75; - padding-bottom: 0.3em; - letter-spacing: -0.035em; - margin: 0 0 0.444em; - */ } h2 { font-size: 1.5em; margin: 0 0 0.666em; - /* - border-bottom: 1px dashed #888; - margin: 0 0 .444em -1px; - padding: 0 0 .222em 1px; - */ } h3 { font-size: 1.125em; -- cgit v1.2.3 From 61917024a6e927db44aff03e4d7ea5a64bd3ec08 Mon Sep 17 00:00:00 2001 From: Anika Henke <anika@selfthinker.org> Date: Sun, 29 Jan 2012 18:25:52 +0000 Subject: added 5 new language strings for action tools and skip link (needs translations) This is in preparation for the new default template. This also updates the tpl_actiondropdown() to use most of them. --- inc/lang/de/lang.php | 5 +++++ inc/lang/en/lang.php | 5 +++++ inc/template.php | 6 +++--- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/inc/lang/de/lang.php b/inc/lang/de/lang.php index 08e72fec2..f36c9949c 100644 --- a/inc/lang/de/lang.php +++ b/inc/lang/de/lang.php @@ -198,6 +198,11 @@ $lang['external_edit'] = 'Externe Bearbeitung'; $lang['summary'] = 'Zusammenfassung'; $lang['noflash'] = 'Das <a href="http://www.adobe.com/products/flashplayer/">Adobe Flash Plugin</a> wird benötigt, um diesen Inhalt anzuzeigen.'; $lang['download'] = 'Schnipsel herunterladen'; +$lang['tools'] = 'Werkzeuge'; +$lang['user_tools'] = 'Benutzer-Werkzeuge'; +$lang['site_tools'] = 'Webseiten-Werkzeuge'; +$lang['page_tools'] = 'Seiten-Werkzeuge'; +$lang['skip_to_content'] = 'zum Inhalt springen'; $lang['mail_newpage'] = 'Neue Seite:'; $lang['mail_changed'] = 'Seite geändert:'; $lang['mail_subscribe_list'] = 'Geänderte Seiten im Namensraum:'; diff --git a/inc/lang/en/lang.php b/inc/lang/en/lang.php index 3f74a8d9c..24974ea5e 100644 --- a/inc/lang/en/lang.php +++ b/inc/lang/en/lang.php @@ -195,6 +195,11 @@ $lang['external_edit'] = 'external edit'; $lang['summary'] = 'Edit summary'; $lang['noflash'] = 'The <a href="http://www.adobe.com/products/flashplayer/">Adobe Flash Plugin</a> is needed to display this content.'; $lang['download'] = 'Download Snippet'; +$lang['tools'] = 'Tools'; +$lang['user_tools'] = 'User Tools'; +$lang['site_tools'] = 'Site Tools'; +$lang['page_tools'] = 'Page Tools'; +$lang['skip_to_content'] = 'skip to content'; $lang['mail_newpage'] = 'page added:'; $lang['mail_changed'] = 'page changed:'; diff --git a/inc/template.php b/inc/template.php index 024bf985c..ca4b6327d 100644 --- a/inc/template.php +++ b/inc/template.php @@ -1270,7 +1270,7 @@ function tpl_actiondropdown($empty='',$button='>'){ echo '<select name="do" class="edit quickselect">'; echo '<option value="">'.$empty.'</option>'; - echo '<optgroup label=" — ">'; + echo '<optgroup label="'.$lang['page_tools'].'">'; $act = tpl_get_action('edit'); if($act) echo '<option value="'.$act['params']['do'].'">'.$lang['btn_'.$act['type']].'</option>'; @@ -1284,7 +1284,7 @@ function tpl_actiondropdown($empty='',$button='>'){ if($act) echo '<option value="'.$act['params']['do'].'">'.$lang['btn_'.$act['type']].'</option>'; echo '</optgroup>'; - echo '<optgroup label=" — ">'; + echo '<optgroup label="'.$lang['site_tools'].'">'; $act = tpl_get_action('recent'); if($act) echo '<option value="'.$act['params']['do'].'">'.$lang['btn_'.$act['type']].'</option>'; @@ -1292,7 +1292,7 @@ function tpl_actiondropdown($empty='',$button='>'){ if($act) echo '<option value="'.$act['params']['do'].'">'.$lang['btn_'.$act['type']].'</option>'; echo '</optgroup>'; - echo '<optgroup label=" — ">'; + echo '<optgroup label="'.$lang['user_tools'].'">'; $act = tpl_get_action('login'); if($act) echo '<option value="'.$act['params']['do'].'">'.$lang['btn_'.$act['type']].'</option>'; -- cgit v1.2.3 From 3b9a3b55d79835f89ea33233f4703361be4ba5f9 Mon Sep 17 00:00:00 2001 From: Anika Henke <anika@selfthinker.org> Date: Sun, 29 Jan 2012 18:56:24 +0000 Subject: added missing actions to tpl_actiondropdown() --- inc/template.php | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/inc/template.php b/inc/template.php index ca4b6327d..d6b7af1e8 100644 --- a/inc/template.php +++ b/inc/template.php @@ -1263,6 +1263,7 @@ function tpl_actiondropdown($empty='',$button='>'){ global $auth; echo '<form action="' . DOKU_SCRIPT . '" method="post" accept-charset="utf-8">'; + echo '<div class="no">'; echo '<input type="hidden" name="id" value="'.$ID.'" />'; if($REV) echo '<input type="hidden" name="rev" value="'.$REV.'" />'; echo '<input type="hidden" name="sectok" value="'.getSecurityToken().'" />'; @@ -1274,20 +1275,26 @@ function tpl_actiondropdown($empty='',$button='>'){ $act = tpl_get_action('edit'); if($act) echo '<option value="'.$act['params']['do'].'">'.$lang['btn_'.$act['type']].'</option>'; - $act = tpl_get_action('revisions'); + $act = tpl_get_action('revert'); if($act) echo '<option value="'.$act['params']['do'].'">'.$lang['btn_'.$act['type']].'</option>'; - $act = tpl_get_action('revert'); + $act = tpl_get_action('revisions'); if($act) echo '<option value="'.$act['params']['do'].'">'.$lang['btn_'.$act['type']].'</option>'; $act = tpl_get_action('backlink'); if($act) echo '<option value="'.$act['params']['do'].'">'.$lang['btn_'.$act['type']].'</option>'; - echo '</optgroup>'; + + $act = tpl_get_action('subscribe'); + if($act) echo '<option value="'.$act['params']['do'].'">'.$lang['btn_'.$act['type']].'</option>'; + echo '</optgroup>'; echo '<optgroup label="'.$lang['site_tools'].'">'; $act = tpl_get_action('recent'); if($act) echo '<option value="'.$act['params']['do'].'">'.$lang['btn_'.$act['type']].'</option>'; + $act = tpl_get_action('media'); + if($act) echo '<option value="'.$act['params']['do'].'">'.$lang['btn_'.$act['type']].'</option>'; + $act = tpl_get_action('index'); if($act) echo '<option value="'.$act['params']['do'].'">'.$lang['btn_'.$act['type']].'</option>'; echo '</optgroup>'; @@ -1296,10 +1303,10 @@ function tpl_actiondropdown($empty='',$button='>'){ $act = tpl_get_action('login'); if($act) echo '<option value="'.$act['params']['do'].'">'.$lang['btn_'.$act['type']].'</option>'; - $act = tpl_get_action('profile'); + $act = tpl_get_action('register'); if($act) echo '<option value="'.$act['params']['do'].'">'.$lang['btn_'.$act['type']].'</option>'; - $act = tpl_get_action('subscribe'); + $act = tpl_get_action('profile'); if($act) echo '<option value="'.$act['params']['do'].'">'.$lang['btn_'.$act['type']].'</option>'; $act = tpl_get_action('admin'); @@ -1308,6 +1315,7 @@ function tpl_actiondropdown($empty='',$button='>'){ echo '</select>'; echo '<input type="submit" value="'.$button.'" />'; + echo '</div>'; echo '</form>'; } -- cgit v1.2.3 From 91e9045718073c3a4ad4ce581e9192f0a87baaf7 Mon Sep 17 00:00:00 2001 From: Anika Henke <anika@selfthinker.org> Date: Sun, 29 Jan 2012 19:15:13 +0000 Subject: added two new config options: tagline and sidebar Templates authors should support these to make the transition between templates easier. Templates which already have a sidebar could first check for $conf['sidebar'] and use it if it's defined, otherwise use their old own sidebar functionality to stay backwards-compatible. --- conf/dokuwiki.php | 2 ++ lib/plugins/config/lang/en/lang.php | 2 ++ lib/plugins/config/settings/config.metadata.php | 2 ++ 3 files changed, 6 insertions(+) diff --git a/conf/dokuwiki.php b/conf/dokuwiki.php index 41f0fd566..7a7e4bf1a 100644 --- a/conf/dokuwiki.php +++ b/conf/dokuwiki.php @@ -28,6 +28,8 @@ $conf['mediarevisions'] = 1; //enable/disable media revisions $conf['start'] = 'start'; //name of start page $conf['title'] = 'DokuWiki'; //what to show in the title $conf['template'] = 'default'; //see lib/tpl directory +$conf['tagline'] = ''; //tagline in header (if template supports it) +$conf['sidebar'] = 'sidebar'; //name of sidebar in root namespace (if template supports it) $conf['license'] = 'cc-by-nc-sa'; //see conf/license.php $conf['fullpath'] = 0; //show full path of the document or relative to datadir only? 0|1 $conf['recent'] = 20; //how many entries to show in recent diff --git a/lib/plugins/config/lang/en/lang.php b/lib/plugins/config/lang/en/lang.php index a075d7cc2..74ec56345 100644 --- a/lib/plugins/config/lang/en/lang.php +++ b/lib/plugins/config/lang/en/lang.php @@ -62,6 +62,8 @@ $lang['cookiedir'] = 'Cookie path. Leave blank for using baseurl.'; $lang['start'] = 'Start page name'; $lang['title'] = 'Wiki title'; $lang['template'] = 'Template'; +$lang['tagline'] = 'Tagline (if template supports it)'; +$lang['sidebar'] = 'Sidebar page name (if template supports it), empty field disables the sidebar'; $lang['license'] = 'Under which license should your content be released?'; $lang['fullpath'] = 'Reveal full path of pages in the footer'; $lang['recent'] = 'Recent changes'; diff --git a/lib/plugins/config/settings/config.metadata.php b/lib/plugins/config/settings/config.metadata.php index d8ad06134..96451e857 100644 --- a/lib/plugins/config/settings/config.metadata.php +++ b/lib/plugins/config/settings/config.metadata.php @@ -91,6 +91,8 @@ $meta['title'] = array('string'); $meta['start'] = array('string','_pattern' => '!^[^:;/]+$!'); // don't accept namespaces $meta['lang'] = array('dirchoice','_dir' => DOKU_INC.'inc/lang/'); $meta['template'] = array('dirchoice','_dir' => DOKU_INC.'lib/tpl/','_pattern' => '/^[\w-]+$/'); +$meta['tagline'] = array('string'); +$meta['sidebar'] = array('string'); $meta['license'] = array('license'); $meta['savedir'] = array('savedir'); $meta['basedir'] = array('string'); -- cgit v1.2.3 From 4cae4c316c15a8c583487dc4b519966412b041b1 Mon Sep 17 00:00:00 2001 From: Anika Henke <anika@selfthinker.org> Date: Sun, 29 Jan 2012 19:18:51 +0000 Subject: improved some form elements in mobile styles --- css/mobile.css | 7 +++++++ css/rtl.css | 5 +++++ 2 files changed, 12 insertions(+) diff --git a/css/mobile.css b/css/mobile.css index c54c28473..f3dcd3af6 100644 --- a/css/mobile.css +++ b/css/mobile.css @@ -148,6 +148,13 @@ h1 { margin-right: 0; } +.dokuwiki label.block { + text-align: left; +} +.dokuwiki label.block span { + display: block; +} + /* _edit */ .dokuwiki div.section_highlight { margin: 0; diff --git a/css/rtl.css b/css/rtl.css index e073acba3..d25ba3e3e 100755 --- a/css/rtl.css +++ b/css/rtl.css @@ -566,5 +566,10 @@ form#subscribe__form fieldset { border-right-width: 0; } +.dokuwiki label.block { + text-align: right; +} + + } /* /@media */ -- cgit v1.2.3 From f97b05c8443027d9d2cc46d95b733f8d520088b1 Mon Sep 17 00:00:00 2001 From: Anika Henke <anika@selfthinker.org> Date: Sun, 29 Jan 2012 19:21:24 +0000 Subject: changed tpl lang to new core lang strings --- detail.php | 2 +- main.php | 4 ++-- tpl_header.php | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/detail.php b/detail.php index 23e77530d..784174891 100755 --- a/detail.php +++ b/detail.php @@ -117,7 +117,7 @@ $showSidebar = tpl_getConf('sidebarID') && page_exists(tpl_getConf('sidebarID')) <!-- PAGE ACTIONS --> <?php if ($showTools && !$ERROR): ?> <div id="dokuwiki__pagetools"> - <h3 class="a11y"><?php echo tpl_getLang('page_tools') ?></h3> + <h3 class="a11y"><?php echo $lang['page_tools']; ?></h3> <div class="tools"> <ul> <?php // View in media manager; @todo: transfer logic to backend diff --git a/main.php b/main.php index 7aa4748cb..1a67c6432 100755 --- a/main.php +++ b/main.php @@ -74,13 +74,13 @@ $showSidebar = tpl_getConf('sidebarID') && page_exists(tpl_getConf('sidebarID')) <!-- PAGE ACTIONS --> <?php if ($showTools): ?> <div id="dokuwiki__pagetools"> - <h3 class="a11y"><?php echo tpl_getLang('page_tools') ?></h3> + <h3 class="a11y"><?php echo $lang['page_tools']; ?></h3> <div class="tools"> <ul> <?php tpl_action('edit', 1, 'li', 0, '<span>', '</span>'); tpl_action('revert', 1, 'li', 0, '<span>', '</span>'); - tpl_action('history', 1, 'li', 0, '<span>', '</span>'); + tpl_action('revisions', 1, 'li', 0, '<span>', '</span>'); tpl_action('backlink', 1, 'li', 0, '<span>', '</span>'); tpl_action('subscribe', 1, 'li', 0, '<span>', '</span>'); tpl_action('top', 1, 'li', 0, '<span>', '</span>'); diff --git a/tpl_header.php b/tpl_header.php index 40094e30e..85164a9ef 100644 --- a/tpl_header.php +++ b/tpl_header.php @@ -6,7 +6,7 @@ <div class="headings group"> <ul class="a11y skip"> - <li><a href="#dokuwiki__content"><?php echo tpl_getLang('skip_to_content') ?></a></li> + <li><a href="#dokuwiki__content"><?php echo $lang['skip_to_content']; ?></a></li> </ul> <h1><?php tpl_link( @@ -23,7 +23,7 @@ <!-- USER TOOLS --> <?php if ($conf['useacl'] && $showTools): ?> <div id="dokuwiki__usertools"> - <h3 class="a11y"><?php echo tpl_getLang('user_tools') ?></h3> + <h3 class="a11y"><?php echo $lang['user_tools']; ?></h3> <ul> <?php /* the optional second parameter of tpl_action() switches between a link and a button, e.g. a button inside a <li> would be: tpl_action('edit',0,'li') */ @@ -43,11 +43,11 @@ <!-- SITE TOOLS --> <div id="dokuwiki__sitetools"> - <h3 class="a11y"><?php echo tpl_getLang('site_tools') ?></h3> + <h3 class="a11y"><?php echo $lang['site_tools']; ?></h3> <?php tpl_searchform(); ?> <?php /* all the tools in one dropdown (good for mobile view): */ ?> <div class="mobileTools"> - <?php tpl_actiondropdown('Tools'); /* @todo: lang */ ?> + <?php tpl_actiondropdown($lang['tools']); ?> </div> <ul> <?php -- cgit v1.2.3 From b957766481df153dfbc9b63506b94c2425c857d5 Mon Sep 17 00:00:00 2001 From: Anika Henke <anika@selfthinker.org> Date: Sun, 29 Jan 2012 19:32:35 +0000 Subject: changed tpl conf options (for sidebar and tagline) to new core conf and removed hideTools option --- detail.php | 5 ++--- main.php | 35 ++++++++++++++++------------------- tpl_header.php | 6 +++--- 3 files changed, 21 insertions(+), 25 deletions(-) diff --git a/detail.php b/detail.php index 784174891..cdda77ac6 100755 --- a/detail.php +++ b/detail.php @@ -11,8 +11,7 @@ if (!defined('DOKU_INC')) die(); @require_once(dirname(__FILE__).'/tpl_functions.php'); /* include hook for template functions */ -$showTools = !tpl_getConf('hideTools') || ( tpl_getConf('hideTools') && $_SERVER['REMOTE_USER'] ); -$showSidebar = tpl_getConf('sidebarID') && page_exists(tpl_getConf('sidebarID')) && ($ACT=='show'); +$showSidebar = $conf['sidebar'] && page_exists($conf['sidebar']) && ($ACT=='show'); ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php echo $conf['lang']?>" @@ -115,7 +114,7 @@ $showSidebar = tpl_getConf('sidebarID') && page_exists(tpl_getConf('sidebarID')) <hr class="a11y" /> <!-- PAGE ACTIONS --> - <?php if ($showTools && !$ERROR): ?> + <?php if (!$ERROR): ?> <div id="dokuwiki__pagetools"> <h3 class="a11y"><?php echo $lang['page_tools']; ?></h3> <div class="tools"> diff --git a/main.php b/main.php index 1a67c6432..b7985d560 100755 --- a/main.php +++ b/main.php @@ -11,8 +11,7 @@ if (!defined('DOKU_INC')) die(); /* must be run from within DokuWiki */ @require_once(dirname(__FILE__).'/tpl_functions.php'); /* include hook for template functions */ -$showTools = !tpl_getConf('hideTools') || ( tpl_getConf('hideTools') && $_SERVER['REMOTE_USER'] ); -$showSidebar = tpl_getConf('sidebarID') && page_exists(tpl_getConf('sidebarID')) && ($ACT=='show'); +$showSidebar = $conf['sidebar'] && page_exists($conf['sidebar']) && ($ACT=='show'); ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php echo $conf['lang'] ?>" @@ -46,7 +45,7 @@ $showSidebar = tpl_getConf('sidebarID') && page_exists(tpl_getConf('sidebarID')) <?php if($showSidebar): ?> <!-- ********** ASIDE ********** --> <div id="dokuwiki__aside"><div class="pad include group"> - <?php tpl_include_page(tpl_getConf('sidebarID')) /* includes the given wiki page */ ?> + <?php tpl_include_page($conf['sidebar']) /* includes the given wiki page */ ?> </div></div><!-- /aside --> <?php endif; ?> @@ -72,23 +71,21 @@ $showSidebar = tpl_getConf('sidebarID') && page_exists(tpl_getConf('sidebarID')) <hr class="a11y" /> <!-- PAGE ACTIONS --> - <?php if ($showTools): ?> - <div id="dokuwiki__pagetools"> - <h3 class="a11y"><?php echo $lang['page_tools']; ?></h3> - <div class="tools"> - <ul> - <?php - tpl_action('edit', 1, 'li', 0, '<span>', '</span>'); - tpl_action('revert', 1, 'li', 0, '<span>', '</span>'); - tpl_action('revisions', 1, 'li', 0, '<span>', '</span>'); - tpl_action('backlink', 1, 'li', 0, '<span>', '</span>'); - tpl_action('subscribe', 1, 'li', 0, '<span>', '</span>'); - tpl_action('top', 1, 'li', 0, '<span>', '</span>'); - ?> - </ul> - </div> + <div id="dokuwiki__pagetools"> + <h3 class="a11y"><?php echo $lang['page_tools']; ?></h3> + <div class="tools"> + <ul> + <?php + tpl_action('edit', 1, 'li', 0, '<span>', '</span>'); + tpl_action('revert', 1, 'li', 0, '<span>', '</span>'); + tpl_action('revisions', 1, 'li', 0, '<span>', '</span>'); + tpl_action('backlink', 1, 'li', 0, '<span>', '</span>'); + tpl_action('subscribe', 1, 'li', 0, '<span>', '</span>'); + tpl_action('top', 1, 'li', 0, '<span>', '</span>'); + ?> + </ul> </div> - <?php endif; ?> + </div> </div><!-- /wrapper --> <?php include('tpl_footer.php') ?> diff --git a/tpl_header.php b/tpl_header.php index 85164a9ef..e536cdf26 100644 --- a/tpl_header.php +++ b/tpl_header.php @@ -14,14 +14,14 @@ '<img src="'.tpl_getFavicon(false, 'logo.png').'" width="64" height="64" alt="" /> <span>'.$conf['title'].'</span>', 'accesskey="h" title="[H]"' ) /* @todo: obviously don't use tpl_getFavicon, but make a new function (or use a config option?) */ ?></h1> - <?php if (tpl_getConf('tagline')): ?> - <p class="claim"><?php echo tpl_getConf('tagline') ?></p> + <?php if ($conf['tagline']): ?> + <p class="claim"><?php echo $conf['tagline']; ?></p> <?php endif ?> </div> <div class="tools group"> <!-- USER TOOLS --> - <?php if ($conf['useacl'] && $showTools): ?> + <?php if ($conf['useacl']): ?> <div id="dokuwiki__usertools"> <h3 class="a11y"><?php echo $lang['user_tools']; ?></h3> <ul> -- cgit v1.2.3 From 3917d35496a0a9fcf6cd4581760a14359d935519 Mon Sep 17 00:00:00 2001 From: Anika Henke <anika@selfthinker.org> Date: Sun, 29 Jan 2012 19:33:24 +0000 Subject: removed now obsolete conf and lang folders --- conf/default.php | 9 --------- conf/metadata.php | 9 --------- lang/af/lang.php | 12 ------------ lang/ar/lang.php | 13 ------------- lang/az/lang.php | 12 ------------ lang/bg/lang.php | 12 ------------ lang/ca/lang.php | 13 ------------- lang/cs/lang.php | 12 ------------ lang/da/lang.php | 13 ------------- lang/de/lang.php | 18 ------------------ lang/el/lang.php | 12 ------------ lang/en/lang.php | 11 ----------- lang/en/settings.php | 9 --------- lang/eo/lang.php | 11 ----------- lang/es/lang.php | 12 ------------ lang/et/lang.php | 13 ------------- lang/eu/lang.php | 12 ------------ lang/fa/lang.php | 12 ------------ lang/fi/lang.php | 13 ------------- lang/fo/lang.php | 11 ----------- lang/fr/lang.php | 12 ------------ lang/gl/lang.php | 12 ------------ lang/he/lang.php | 12 ------------ lang/hi/lang.php | 12 ------------ lang/hr/lang.php | 12 ------------ lang/hu/lang.php | 12 ------------ lang/ia/lang.php | 11 ----------- lang/id/lang.php | 12 ------------ lang/is/lang.php | 12 ------------ lang/it/lang.php | 12 ------------ lang/ja/lang.php | 12 ------------ lang/km/lang.php | 11 ----------- lang/ko/lang.php | 12 ------------ lang/la/lang.php | 11 ----------- lang/lb/lang.php | 11 ----------- lang/lt/lang.php | 12 ------------ lang/lv/lang.php | 12 ------------ lang/mg/lang.php | 11 ----------- lang/mk/lang.php | 12 ------------ lang/mr/lang.php | 11 ----------- lang/ne/lang.php | 11 ----------- lang/nl/lang.php | 12 ------------ lang/no/lang.php | 12 ------------ lang/pl/lang.php | 12 ------------ lang/pt-br/lang.php | 12 ------------ lang/pt/lang.php | 12 ------------ lang/ro/lang.php | 12 ------------ lang/ru/lang.php | 12 ------------ lang/sk/lang.php | 12 ------------ lang/sl/lang.php | 12 ------------ lang/sq/lang.php | 12 ------------ lang/sr/lang.php | 8 -------- lang/sv/lang.php | 12 ------------ lang/th/lang.php | 12 ------------ lang/tr/lang.php | 12 ------------ lang/uk/lang.php | 12 ------------ lang/vi/lang.php | 12 ------------ lang/zh-tw/lang.php | 12 ------------ lang/zh/lang.php | 12 ------------ 59 files changed, 696 deletions(-) delete mode 100755 conf/default.php delete mode 100755 conf/metadata.php delete mode 100755 lang/af/lang.php delete mode 100755 lang/ar/lang.php delete mode 100755 lang/az/lang.php delete mode 100755 lang/bg/lang.php delete mode 100755 lang/ca/lang.php delete mode 100755 lang/cs/lang.php delete mode 100755 lang/da/lang.php delete mode 100755 lang/de/lang.php delete mode 100755 lang/el/lang.php delete mode 100755 lang/en/lang.php delete mode 100755 lang/en/settings.php delete mode 100755 lang/eo/lang.php delete mode 100755 lang/es/lang.php delete mode 100755 lang/et/lang.php delete mode 100755 lang/eu/lang.php delete mode 100755 lang/fa/lang.php delete mode 100755 lang/fi/lang.php delete mode 100755 lang/fo/lang.php delete mode 100755 lang/fr/lang.php delete mode 100755 lang/gl/lang.php delete mode 100755 lang/he/lang.php delete mode 100755 lang/hi/lang.php delete mode 100755 lang/hr/lang.php delete mode 100755 lang/hu/lang.php delete mode 100755 lang/ia/lang.php delete mode 100755 lang/id/lang.php delete mode 100755 lang/is/lang.php delete mode 100755 lang/it/lang.php delete mode 100755 lang/ja/lang.php delete mode 100755 lang/km/lang.php delete mode 100755 lang/ko/lang.php delete mode 100755 lang/la/lang.php delete mode 100755 lang/lb/lang.php delete mode 100755 lang/lt/lang.php delete mode 100755 lang/lv/lang.php delete mode 100755 lang/mg/lang.php delete mode 100755 lang/mk/lang.php delete mode 100755 lang/mr/lang.php delete mode 100755 lang/ne/lang.php delete mode 100755 lang/nl/lang.php delete mode 100755 lang/no/lang.php delete mode 100755 lang/pl/lang.php delete mode 100755 lang/pt-br/lang.php delete mode 100755 lang/pt/lang.php delete mode 100755 lang/ro/lang.php delete mode 100755 lang/ru/lang.php delete mode 100755 lang/sk/lang.php delete mode 100755 lang/sl/lang.php delete mode 100755 lang/sq/lang.php delete mode 100755 lang/sr/lang.php delete mode 100755 lang/sv/lang.php delete mode 100755 lang/th/lang.php delete mode 100755 lang/tr/lang.php delete mode 100755 lang/uk/lang.php delete mode 100755 lang/vi/lang.php delete mode 100755 lang/zh-tw/lang.php delete mode 100755 lang/zh/lang.php diff --git a/conf/default.php b/conf/default.php deleted file mode 100755 index 378e61909..000000000 --- a/conf/default.php +++ /dev/null @@ -1,9 +0,0 @@ -<?php -/* - * default configuration settings - * - */ - -$conf['tagline'] = 'This is the tagline - explaining what this site is about.'; -$conf['sidebarID'] = 'sidebar'; -$conf['hideTools'] = 0; diff --git a/conf/metadata.php b/conf/metadata.php deleted file mode 100755 index ac0fdf142..000000000 --- a/conf/metadata.php +++ /dev/null @@ -1,9 +0,0 @@ -<?php -/* - * configuration metadata - * - */ - -$meta['tagline'] = array('string'); -$meta['sidebarID'] = array('string'); -$meta['hideTools'] = array('onoff'); diff --git a/lang/af/lang.php b/lang/af/lang.php deleted file mode 100755 index 127ac3076..000000000 --- a/lang/af/lang.php +++ /dev/null @@ -1,12 +0,0 @@ -<?php -/** - * Afrikaans language file - * - * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - */ - -$lang['discussion'] = 'Bespreking'; -$lang['back_to_article'] = 'Terug na die artikel'; -$lang['userpage'] = 'Gebruikersbladsy'; - -//Setup VIM: ex: et ts=2 : diff --git a/lang/ar/lang.php b/lang/ar/lang.php deleted file mode 100755 index d5c10bb1c..000000000 --- a/lang/ar/lang.php +++ /dev/null @@ -1,13 +0,0 @@ -<?php -/** - * Arabic language file - * - * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - */ - -$lang['discussion'] = 'نقاش'; -$lang['back_to_article'] = 'عودة إلى المقالة'; -//العودة إلى المقال -$lang['userpage'] = 'صفحة مستخدم'; - -//Setup VIM: ex: et ts=2 : diff --git a/lang/az/lang.php b/lang/az/lang.php deleted file mode 100755 index ea94e8706..000000000 --- a/lang/az/lang.php +++ /dev/null @@ -1,12 +0,0 @@ -<?php -/** - * Azerbaijani language file - * - * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - */ - -$lang['discussion'] = 'Müzakirə'; -$lang['back_to_article'] = 'Geri makalenin'; // Məqalədə qayıt -$lang['userpage'] = 'İstifadəçi səhifəsi'; - -//Setup VIM: ex: et ts=2 : diff --git a/lang/bg/lang.php b/lang/bg/lang.php deleted file mode 100755 index 039b07a1f..000000000 --- a/lang/bg/lang.php +++ /dev/null @@ -1,12 +0,0 @@ -<?php -/** - * Bulgarian language file - * - * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - */ - -$lang['discussion'] = 'Беседа'; -$lang['back_to_article'] = 'Обратно към статията'; -$lang['userpage'] = 'Потребител'; - -//Setup VIM: ex: et ts=2 : diff --git a/lang/ca/lang.php b/lang/ca/lang.php deleted file mode 100755 index 3ed0be76d..000000000 --- a/lang/ca/lang.php +++ /dev/null @@ -1,13 +0,0 @@ -<?php -/** - * Catalan language file - * - * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - */ - -$lang['discussion'] = 'Discussió'; -$lang['back_to_article'] = 'Tornar al article'; -$lang['userpage'] = "Pàgina d'usuari"; - - -//Setup VIM: ex: et ts=2 : diff --git a/lang/cs/lang.php b/lang/cs/lang.php deleted file mode 100755 index d4e0ef32a..000000000 --- a/lang/cs/lang.php +++ /dev/null @@ -1,12 +0,0 @@ -<?php -/** - * Czech language file - * - * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - */ - -$lang['discussion'] = 'Diskuse'; -$lang['back_to_article'] = 'Zpet na clánek'; -$lang['userpage'] = 'Uživatelova stránka'; - -//Setup VIM: ex: et ts=2 : diff --git a/lang/da/lang.php b/lang/da/lang.php deleted file mode 100755 index 1837ab5dd..000000000 --- a/lang/da/lang.php +++ /dev/null @@ -1,13 +0,0 @@ -<?php -/** - * Danish language file - * - * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - */ - -$lang['discussion'] = 'Diskussion'; -$lang['back_to_article'] = 'Tilbage til artiklen'; -$lang['userpage'] = 'Brugerside'; - -//Setup VIM: ex: et ts=2 : - diff --git a/lang/de/lang.php b/lang/de/lang.php deleted file mode 100755 index 808d9e247..000000000 --- a/lang/de/lang.php +++ /dev/null @@ -1,18 +0,0 @@ -<?php -/** - * German language file - * - * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - */ - -$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/el/lang.php b/lang/el/lang.php deleted file mode 100755 index 135e0a10f..000000000 --- a/lang/el/lang.php +++ /dev/null @@ -1,12 +0,0 @@ -<?php -/** - * Greek language file - * - * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - */ - -$lang['discussion'] = 'Συζήτηση'; -$lang['back_to_article'] = 'Πίσω στα άρθρα'; -$lang['userpage'] = 'Σελίδα χρήστη'; - -//Setup VIM: ex: et ts=2 : diff --git a/lang/en/lang.php b/lang/en/lang.php deleted file mode 100755 index a19601ef9..000000000 --- a/lang/en/lang.php +++ /dev/null @@ -1,11 +0,0 @@ -<?php -/** - * English language file for template - * - */ - -/* accessibility headlines */ -$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 deleted file mode 100755 index da01d290f..000000000 --- a/lang/en/settings.php +++ /dev/null @@ -1,9 +0,0 @@ -<?php -/** - * English language file for config - * - */ - -$lang['tagline'] = 'Tagline'; -$lang['sidebarID'] = 'page name of page included in sidebar'; -$lang['hideTools'] = 'Hide tools when not logged in?'; diff --git a/lang/eo/lang.php b/lang/eo/lang.php deleted file mode 100755 index cc637392e..000000000 --- a/lang/eo/lang.php +++ /dev/null @@ -1,11 +0,0 @@ -<?php -/** - * Esperantiga dosiero - * - * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - */ - -$lang['discussion'] = 'Diskuto'; -$lang['userpage'] = 'Pago de uzanto'; - -//Setup VIM: ex: et ts=2 : diff --git a/lang/es/lang.php b/lang/es/lang.php deleted file mode 100755 index d949b3f90..000000000 --- a/lang/es/lang.php +++ /dev/null @@ -1,12 +0,0 @@ -<?php -/** - * Spanish language file - * - * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - */ - -$lang['discussion'] = 'Discusión'; -$lang['back_to_article'] = 'Volver al artículo'; -$lang['userpage'] = 'Página de usuario'; - -//Setup VIM: ex: et ts=2 : diff --git a/lang/et/lang.php b/lang/et/lang.php deleted file mode 100755 index f6223b752..000000000 --- a/lang/et/lang.php +++ /dev/null @@ -1,13 +0,0 @@ -<?php -/** - * Estonian language file - * - * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - */ - -$lang['discussion'] = 'Arutelu'; -$lang['back_to_article'] = 'Tagasi artikli'; -$lang['userpage'] = 'Kasutaja leht'; - - -//Setup VIM: ex: et ts=2 : diff --git a/lang/eu/lang.php b/lang/eu/lang.php deleted file mode 100755 index a71127072..000000000 --- a/lang/eu/lang.php +++ /dev/null @@ -1,12 +0,0 @@ -<?php -/** - * Basque language file - * - * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - */ - -$lang['discussion'] = 'Eztabaida'; -$lang['back_to_article'] = 'Bueltatu'; -$lang['userpage'] = 'Lankide orrialdea';//Erabiltzaile orrialdea - -//Setup VIM: ex: et ts=2 : diff --git a/lang/fa/lang.php b/lang/fa/lang.php deleted file mode 100755 index 23caa26b8..000000000 --- a/lang/fa/lang.php +++ /dev/null @@ -1,12 +0,0 @@ -<?php -/** - * Persian language file - * - * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - */ - -$lang['discussion'] = 'بحث'; -$lang['back_to_article'] = 'برگشت به مقاله'; -$lang['userpage'] = 'صفحهٔ کاربر'; - -//Setup VIM: ex: et ts=2 : diff --git a/lang/fi/lang.php b/lang/fi/lang.php deleted file mode 100755 index f64555b65..000000000 --- a/lang/fi/lang.php +++ /dev/null @@ -1,13 +0,0 @@ -<?php -/** - * Finnish language file - * - * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - */ - -$lang['discussion'] = 'Keskustelu'; -$lang['back_to_article'] = 'Takaisin artikkeliin'; -$lang['userpage'] = 'Käyttäjäsivu'; - - -//Setup VIM: ex: et ts=2 : diff --git a/lang/fo/lang.php b/lang/fo/lang.php deleted file mode 100755 index 4e3d7d2de..000000000 --- a/lang/fo/lang.php +++ /dev/null @@ -1,11 +0,0 @@ -<?php -/** - * Faroese language file - * - * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - */ - -$lang['discussion'] = 'Kjak'; -$lang['userpage'] = 'Brúkarasíða'; - -//Setup VIM: ex: et ts=2 : diff --git a/lang/fr/lang.php b/lang/fr/lang.php deleted file mode 100755 index fa01076b2..000000000 --- a/lang/fr/lang.php +++ /dev/null @@ -1,12 +0,0 @@ -<?php -/** - * French language file - * - * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - */ - -$lang['discussion'] = 'Discussion'; -$lang['back_to_article'] = "Retour à l'article"; -$lang['userpage'] = 'Page utilisateur'; - -//Setup VIM: ex: et ts=2 : diff --git a/lang/gl/lang.php b/lang/gl/lang.php deleted file mode 100755 index 4b8fbffe6..000000000 --- a/lang/gl/lang.php +++ /dev/null @@ -1,12 +0,0 @@ -<?php -/** - * Galician language file - * - * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - */ - -$lang['discussion'] = 'Conversa'; -$lang['back_to_article'] = 'Voltar ao artigo'; -$lang['userpage'] = 'Páxina de usuario'; - -//Setup VIM: ex: et ts=2 : diff --git a/lang/he/lang.php b/lang/he/lang.php deleted file mode 100755 index c6a7f55be..000000000 --- a/lang/he/lang.php +++ /dev/null @@ -1,12 +0,0 @@ -<?php -/** - * Hebrew language file - * - * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - */ - -$lang['discussion'] = 'שיחה'; -$lang['back_to_article'] = 'חזור אל המאמר'; -$lang['userpage'] = 'דף משתמש'; - -//Setup VIM: ex: et ts=2 : diff --git a/lang/hi/lang.php b/lang/hi/lang.php deleted file mode 100755 index 298395962..000000000 --- a/lang/hi/lang.php +++ /dev/null @@ -1,12 +0,0 @@ -<?php -/** - * Hindi language file - * - * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - */ - -$lang['discussion'] = 'चर्चा'; -$lang['back_to_article'] = 'वापस लेख करने के लिए'; -$lang['userpage'] = 'सदस्य'; - -//Setup VIM: ex: et ts=2 : diff --git a/lang/hr/lang.php b/lang/hr/lang.php deleted file mode 100755 index cd8ba36cc..000000000 --- a/lang/hr/lang.php +++ /dev/null @@ -1,12 +0,0 @@ -<?php -/** - * Croatian language file - * - * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - */ - -$lang['discussion'] = 'Razgovor'; -$lang['back_to_article'] = 'Natrag na clanak'; -$lang['userpage'] = 'Stranica suradnika'; - -//Setup VIM: ex: et ts=2 : diff --git a/lang/hu/lang.php b/lang/hu/lang.php deleted file mode 100755 index 2227e3ba2..000000000 --- a/lang/hu/lang.php +++ /dev/null @@ -1,12 +0,0 @@ -<?php -/** - * Hungarian language file - * - * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - */ - -$lang['discussion'] = 'Vitalap'; -$lang['back_to_article'] = 'Vissza a cikket'; -$lang['userpage'] = 'Szerkesztoi lap'; - -//Setup VIM: ex: et ts=2 : diff --git a/lang/ia/lang.php b/lang/ia/lang.php deleted file mode 100755 index 7a86ad44a..000000000 --- a/lang/ia/lang.php +++ /dev/null @@ -1,11 +0,0 @@ -<?php -/** - * Interlingua language file - * - * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - */ - -$lang['discussion'] = 'Discussion'; -$lang['userpage'] = 'Pagina de usator'; - -//Setup VIM: ex: et ts=2 : diff --git a/lang/id/lang.php b/lang/id/lang.php deleted file mode 100755 index 7c0d809d5..000000000 --- a/lang/id/lang.php +++ /dev/null @@ -1,12 +0,0 @@ -<?php -/** - * Indonesian language file - * - * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - */ - -$lang['discussion'] = 'Pembicaraan'; -$lang['back_to_article'] = 'Kembali ke artikel'; -$lang['userpage'] = 'Pengguna'; - -//Setup VIM: ex: et ts=2 : diff --git a/lang/is/lang.php b/lang/is/lang.php deleted file mode 100755 index 1a23cd910..000000000 --- a/lang/is/lang.php +++ /dev/null @@ -1,12 +0,0 @@ -<?php -/** - * Icelandic language file - * - * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - */ - -$lang['discussion'] = 'Spjall'; -$lang['back_to_article'] = 'Til baka á greinar'; -$lang['userpage'] = 'Notandi'; - -//Setup VIM: ex: et ts=2 : diff --git a/lang/it/lang.php b/lang/it/lang.php deleted file mode 100755 index f33da8045..000000000 --- a/lang/it/lang.php +++ /dev/null @@ -1,12 +0,0 @@ -<?php -/** - * Italian language file - * - * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - */ - -$lang['discussion'] = 'Discussione'; -$lang['back_to_article'] = 'Torna all\'articolo'; -$lang['userpage'] = 'Pagina utente'; - -//Setup VIM: ex: et ts=2 : diff --git a/lang/ja/lang.php b/lang/ja/lang.php deleted file mode 100755 index 23f65abd3..000000000 --- a/lang/ja/lang.php +++ /dev/null @@ -1,12 +0,0 @@ -<?php -/** - * Japanese language file - * - * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - */ - -$lang['discussion'] = '議論'; -$lang['back_to_article'] = '戻る記事へ'; -$lang['userpage'] = '利用者ページ'; - -//Setup VIM: ex: et ts=2 : diff --git a/lang/km/lang.php b/lang/km/lang.php deleted file mode 100755 index 32de3800d..000000000 --- a/lang/km/lang.php +++ /dev/null @@ -1,11 +0,0 @@ -<?php -/** - * Khmer language file - * - * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - */ - -$lang['discussion'] = 'ការពិភាក្សា'; -$lang['userpage'] = 'ទំព័រអ្នកប្រើប្រាស់'; - -//Setup VIM: ex: et ts=2 : diff --git a/lang/ko/lang.php b/lang/ko/lang.php deleted file mode 100755 index 265c416af..000000000 --- a/lang/ko/lang.php +++ /dev/null @@ -1,12 +0,0 @@ -<?php -/** - * Korean language file - * - * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - */ - -$lang['discussion'] = '토론'; -$lang['back_to_article'] = '위로 기사'; -$lang['userpage'] = '사용자 문서'; - -//Setup VIM: ex: et ts=2 : diff --git a/lang/la/lang.php b/lang/la/lang.php deleted file mode 100755 index 9f2fddffb..000000000 --- a/lang/la/lang.php +++ /dev/null @@ -1,11 +0,0 @@ -<?php -/** - * Latin language file - * - * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - */ - -$lang['discussion'] = 'Disputatio'; -$lang['userpage'] = 'Pagina usoris'; - -//Setup VIM: ex: et ts=2 : diff --git a/lang/lb/lang.php b/lang/lb/lang.php deleted file mode 100755 index ebf0afa35..000000000 --- a/lang/lb/lang.php +++ /dev/null @@ -1,11 +0,0 @@ -<?php -/** - * Luxembourgish language file - * - * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - */ - -$lang['discussion'] = 'Diskussioun'; -$lang['userpage'] = 'Benotzersäit'; - -//Setup VIM: ex: et ts=2 : diff --git a/lang/lt/lang.php b/lang/lt/lang.php deleted file mode 100755 index 389e6491b..000000000 --- a/lang/lt/lang.php +++ /dev/null @@ -1,12 +0,0 @@ -<? -/** - * Lithuanian language file - * - * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - */ - -$lang['discussion'] = 'Aptarimas'; -$lang['back_to_article'] = 'Atgal i straipsni'; -$lang['userpage'] = 'Naudotojo puslapis'; - -//Setup VIM: ex: et ts=2 : \ No newline at end of file diff --git a/lang/lv/lang.php b/lang/lv/lang.php deleted file mode 100755 index 39964ef8c..000000000 --- a/lang/lv/lang.php +++ /dev/null @@ -1,12 +0,0 @@ -<? -/** - * Latvian language file - * - * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) -*/ - -$lang['discussion'] = 'Diskusija'; -$lang['back_to_article'] = 'Atpakaļ uz rakstu'; -$lang['userpage'] = 'Lietotāja lapa'; - -//Setup VIM: ex: et ts=2 : \ No newline at end of file diff --git a/lang/mg/lang.php b/lang/mg/lang.php deleted file mode 100755 index 0ba0d5782..000000000 --- a/lang/mg/lang.php +++ /dev/null @@ -1,11 +0,0 @@ -<?php -/** - * Malagasy language file - * - * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - */ - -$lang['discussion'] = 'Dinika'; -$lang['userpage'] = 'Pejy ny mpikambana'; - -//Setup VIM: ex: et ts=2 : diff --git a/lang/mk/lang.php b/lang/mk/lang.php deleted file mode 100755 index 2be3a697a..000000000 --- a/lang/mk/lang.php +++ /dev/null @@ -1,12 +0,0 @@ -<?php -/** - * Macedonian language file - * - * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - */ - -$lang['discussion'] = 'Разговор'; -$lang['back_to_article'] = 'Назад кон статијата'; -$lang['userpage'] = 'Корисник'; - -//Setup VIM: ex: et ts=2 : diff --git a/lang/mr/lang.php b/lang/mr/lang.php deleted file mode 100755 index d72013bae..000000000 --- a/lang/mr/lang.php +++ /dev/null @@ -1,11 +0,0 @@ -<?php -/** - * Marathi language file - * - * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - */ - -$lang['discussion'] = 'चर्चा'; -$lang['userpage'] = 'सदस्य पान'; - -//Setup VIM: ex: et ts=2 : diff --git a/lang/ne/lang.php b/lang/ne/lang.php deleted file mode 100755 index 6d1b8bcd0..000000000 --- a/lang/ne/lang.php +++ /dev/null @@ -1,11 +0,0 @@ -<?php -/** - * Nepali language file - * - * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - */ - -$lang['discussion'] = 'वार्तालाप'; -$lang['userpage'] = 'प्रयोगकर्ता पृष्ठ'; - -//Setup VIM: ex: et ts=2 : diff --git a/lang/nl/lang.php b/lang/nl/lang.php deleted file mode 100755 index c6d9e3e8f..000000000 --- a/lang/nl/lang.php +++ /dev/null @@ -1,12 +0,0 @@ -<?php -/** - * Dutch language file - * - * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - */ - -$lang['discussion'] = 'Overleg'; -$lang['back_to_article'] = 'Terug naar artikel'; -$lang['userpage'] = 'Gebruikerspagina'; - -//Setup VIM: ex: et ts=2 : \ No newline at end of file diff --git a/lang/no/lang.php b/lang/no/lang.php deleted file mode 100755 index 111e571ad..000000000 --- a/lang/no/lang.php +++ /dev/null @@ -1,12 +0,0 @@ -<?php -/** - * Norwegian language file - * - * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - */ - -$lang['discussion'] = 'Diskusjon'; -$lang['back_to_article'] = 'Tilbake til artikkelen'; -$lang['userpage'] = 'Brukerside'; - -//Setup VIM: ex: et ts=2 : diff --git a/lang/pl/lang.php b/lang/pl/lang.php deleted file mode 100755 index 32f0d8cd5..000000000 --- a/lang/pl/lang.php +++ /dev/null @@ -1,12 +0,0 @@ -<?php -/** - * Polish language file - * - * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - */ - -$lang['discussion'] = 'Dyskusja'; -$lang['back_to_article'] = 'Powrót do artykułu'; -$lang['userpage'] = 'Strona użytkownika'; - -//Setup VIM: ex: et ts=2 : diff --git a/lang/pt-br/lang.php b/lang/pt-br/lang.php deleted file mode 100755 index 4d6d4ddbd..000000000 --- a/lang/pt-br/lang.php +++ /dev/null @@ -1,12 +0,0 @@ -<?php -/** - * Brazilian Portuguese language file - * - * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - */ - -$lang['discussion'] = 'Discussão'; -$lang['back_to_article'] = 'Voltar ao artigo'; -$lang['userpage'] = 'Página de usuário'; - -//Setup VIM: ex: et ts=2 : diff --git a/lang/pt/lang.php b/lang/pt/lang.php deleted file mode 100755 index d11ef9af1..000000000 --- a/lang/pt/lang.php +++ /dev/null @@ -1,12 +0,0 @@ -<?php -/** - * Portuguese language file - * - * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - */ - -$lang['discussion'] = 'Discussão'; -$lang['back_to_article'] = 'Voltar ao artigo'; -$lang['userpage'] = 'Página de utilizador'; - -//Setup VIM: ex: et ts=2 : diff --git a/lang/ro/lang.php b/lang/ro/lang.php deleted file mode 100755 index 15b01a605..000000000 --- a/lang/ro/lang.php +++ /dev/null @@ -1,12 +0,0 @@ -<?php -/** - * Romanian language file - * - * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - */ - -$lang['discussion'] = 'Discuție'; -$lang['back_to_article'] = 'Înapoi la articol'; -$lang['userpage'] = 'Pagină de utilizator'; - -//Setup VIM: ex: et ts=2 : diff --git a/lang/ru/lang.php b/lang/ru/lang.php deleted file mode 100755 index b3e3eaccf..000000000 --- a/lang/ru/lang.php +++ /dev/null @@ -1,12 +0,0 @@ -<?php -/** - * Russian language file - * - * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - */ - -$lang['discussion'] = 'Обсуждение'; -$lang['back_to_article'] = 'Назад к статье'; -$lang['userpage'] = 'Участник'; - -//Setup VIM: ex: et ts=2 : diff --git a/lang/sk/lang.php b/lang/sk/lang.php deleted file mode 100755 index 9113c6468..000000000 --- a/lang/sk/lang.php +++ /dev/null @@ -1,12 +0,0 @@ -<?php -/** - * Slovak language file - * - * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - */ - -$lang['discussion'] = 'Diskusia'; -$lang['back_to_article'] = 'Späť na článok'; -$lang['userpage'] = 'Stránka používateľa'; - -//Setup VIM: ex: et ts=2 : diff --git a/lang/sl/lang.php b/lang/sl/lang.php deleted file mode 100755 index 9c7e9f5c6..000000000 --- a/lang/sl/lang.php +++ /dev/null @@ -1,12 +0,0 @@ -<? -/** - * Slovenian language file - * - * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - */ - -$lang['discussion'] = 'Pogovor'; -$lang['back_to_article'] = 'Nazaj na članek'; -$lang['userpage'] = 'Uporabniška stran'; - -//Setup VIM: ex: et ts=2 : diff --git a/lang/sq/lang.php b/lang/sq/lang.php deleted file mode 100755 index 236d7d54f..000000000 --- a/lang/sq/lang.php +++ /dev/null @@ -1,12 +0,0 @@ -<?php -/** - * Albanian language file - * - * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - */ - -$lang['discussion'] = 'Diskutimet'; -$lang['back_to_article'] = 'Kthehu tek artikulli'; -$lang['userpage'] = 'Përdoruesi'; - -//Setup VIM: ex: et ts=2 : diff --git a/lang/sr/lang.php b/lang/sr/lang.php deleted file mode 100755 index 1212cff9f..000000000 --- a/lang/sr/lang.php +++ /dev/null @@ -1,8 +0,0 @@ -<?php -/** - * Serbian language file - * - * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - */ - -$lang['discussion'] = 'Разговор'; diff --git a/lang/sv/lang.php b/lang/sv/lang.php deleted file mode 100755 index 262a8182e..000000000 --- a/lang/sv/lang.php +++ /dev/null @@ -1,12 +0,0 @@ -<?php -/** - * Swedish language file - * - * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - */ - -$lang['discussion'] = 'Diskussion'; -$lang['back_to_article'] = 'Tillbaka till artikeln'; -$lang['userpage'] = 'Användarsida'; - -//Setup VIM: ex: et ts=2 : diff --git a/lang/th/lang.php b/lang/th/lang.php deleted file mode 100755 index 9c0de5fe2..000000000 --- a/lang/th/lang.php +++ /dev/null @@ -1,12 +0,0 @@ -<?php -/** - * Thai language file - * - * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - */ - -$lang['discussion'] = 'อภิปราย'; -$lang['back_to_article'] = 'กลับไปที่บทความ'; -$lang['userpage'] = 'หน้าผู้ใช้'; - -//Setup VIM: ex: et ts=2 : diff --git a/lang/tr/lang.php b/lang/tr/lang.php deleted file mode 100755 index f0032710a..000000000 --- a/lang/tr/lang.php +++ /dev/null @@ -1,12 +0,0 @@ -<?php -/** - * Turkish language file - * - * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - */ - -$lang['discussion'] = 'Tartışma'; -$lang['back_to_article'] = 'Geri makalenin'; -$lang['userpage'] = 'Kullanıcı sayfası'; - -//Setup VIM: ex: et ts=2 : diff --git a/lang/uk/lang.php b/lang/uk/lang.php deleted file mode 100755 index e2ae7dd0c..000000000 --- a/lang/uk/lang.php +++ /dev/null @@ -1,12 +0,0 @@ -<?php -/** - * Ukrainian language file - * - * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - */ - -$lang['discussion'] = 'Обговорення'; -$lang['back_to_article'] = 'Назад до статті'; -$lang['userpage'] = 'Сторінка користувача'; - -//Setup VIM: ex: et ts=2 : diff --git a/lang/vi/lang.php b/lang/vi/lang.php deleted file mode 100755 index b7bae028a..000000000 --- a/lang/vi/lang.php +++ /dev/null @@ -1,12 +0,0 @@ -<?php -/** - * Vietnamese language file - * - * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - */ - -$lang['discussion'] = 'Thảo luận'; -$lang['back_to_article'] = 'Trở lại bài viết'; -$lang['userpage'] = 'Thành viên'; - -//Setup VIM: ex: et ts=2 : diff --git a/lang/zh-tw/lang.php b/lang/zh-tw/lang.php deleted file mode 100755 index 72c5813c2..000000000 --- a/lang/zh-tw/lang.php +++ /dev/null @@ -1,12 +0,0 @@ -<?php -/** - * Chinese (Traditional) language file - * - * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - */ - -$lang['discussion'] = '討論'; -$lang['back_to_article'] = '回到文章'; -$lang['userpage'] = '用戶頁面'; // 使用者頁面 - -//Setup VIM: ex: et ts=2 : diff --git a/lang/zh/lang.php b/lang/zh/lang.php deleted file mode 100755 index c95d98517..000000000 --- a/lang/zh/lang.php +++ /dev/null @@ -1,12 +0,0 @@ -<?php -/** - * Chinese (Simplified) language file - * - * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - */ - -$lang['discussion'] = '讨论'; -$lang['back_to_article'] = '回到文章'; -$lang['userpage'] = '用户页面'; - -//Setup VIM: ex: et ts=2 : -- cgit v1.2.3 From 27833958afc4d9d54460bd5273a6a56d94c1923f Mon Sep 17 00:00:00 2001 From: Anika Henke <anika@selfthinker.org> Date: Sun, 29 Jan 2012 20:03:50 +0000 Subject: added tpl_getMediaFile() to replace tpl_getFavicon() The function tpl_getFavicon() was doing more than its name was implying. Therefore the new tpl_getMediaFile() was introduced (which is doing nearly exactly the same) and tpl_getFavicon() was deprecated. tpl_favicon() can still be used, though. --- feed.php | 2 +- inc/template.php | 26 ++++++++++++++++++-------- 2 files changed, 19 insertions(+), 9 deletions(-) diff --git a/feed.php b/feed.php index 298777eb9..a7fa95620 100644 --- a/feed.php +++ b/feed.php @@ -50,7 +50,7 @@ $rss->cssStyleSheet = DOKU_URL.'lib/exe/css.php?s=feed'; $image = new FeedImage(); $image->title = $conf['title']; -$image->url = tpl_getFavicon(true); +$image->url = tpl_getMediaFile('favicon.ico', true); $image->link = DOKU_URL; $rss->image = $image; diff --git a/inc/template.php b/inc/template.php index d6b7af1e8..f7a49f002 100644 --- a/inc/template.php +++ b/inc/template.php @@ -1458,16 +1458,15 @@ function tpl_flush(){ flush(); } - /** - * Returns icon from data/media root directory if it exists, otherwise - * the one in the template's image directory. + * Returns link to media file from data/media root directory if it exists, + * otherwise the one in the template's image directory. * - * @param bool $abs - if to use absolute URL * @param string $fileName - file name of icon + * @param bool $abs - if to use absolute URL * @author Anika Henke <anika@selfthinker.org> */ -function tpl_getFavicon($abs=false, $fileName='favicon.ico') { +function tpl_getMediaFile($fileName, $abs=false) { if (file_exists(mediaFN($fileName))) { return ml($fileName, '', true, '', $abs); } @@ -1478,6 +1477,17 @@ function tpl_getFavicon($abs=false, $fileName='favicon.ico') { return DOKU_TPL.'images/'.$fileName; } +/** + * Returns icon from data/media root directory if it exists, otherwise + * the one in the template's image directory. + * + * @deprecated Use tpl_getMediaFile() instead + * @author Anika Henke <anika@selfthinker.org> + */ +function tpl_getFavicon($abs=false, $fileName='favicon.ico') { + return tpl_getMediaFile($fileName, $abs); +} + /** * Returns <link> tag for various icon types (favicon|mobile|generic) * @@ -1491,14 +1501,14 @@ function tpl_favicon($types=array('favicon')) { foreach ($types as $type) { switch($type) { case 'favicon': - $return .= '<link rel="shortcut icon" href="'.tpl_getFavicon().'" />'.NL; + $return .= '<link rel="shortcut icon" href="'.tpl_getMediaFile('favicon.ico').'" />'.NL; break; case 'mobile': - $return .= '<link rel="apple-touch-icon" href="'.tpl_getFavicon(false, 'apple-touch-icon.png').'" />'.NL; + $return .= '<link rel="apple-touch-icon" href="'.tpl_getMediaFile('apple-touch-icon.png').'" />'.NL; break; case 'generic': // ideal world solution, which doesn't work in any browser yet - $return .= '<link rel="icon" href="'.tpl_getFavicon(false, 'icon.svg').'" type="image/svg+xml" />'.NL; + $return .= '<link rel="icon" href="'.tpl_getMediaFile('icon.svg').'" type="image/svg+xml" />'.NL; break; } } -- cgit v1.2.3 From 0cb9a4aa225ea5898516e134a3c9b58596512b19 Mon Sep 17 00:00:00 2001 From: Anika Henke <anika@selfthinker.org> Date: Sun, 29 Jan 2012 20:30:11 +0000 Subject: changed logo to use new tpl_getMediaFile() and exchanged fixed image dimensions with calculated ones (fixes #25) --- tpl_header.php | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/tpl_header.php b/tpl_header.php index e536cdf26..dea494aa0 100644 --- a/tpl_header.php +++ b/tpl_header.php @@ -9,11 +9,19 @@ <li><a href="#dokuwiki__content"><?php echo $lang['skip_to_content']; ?></a></li> </ul> - <h1><?php tpl_link( - wl(), - '<img src="'.tpl_getFavicon(false, 'logo.png').'" width="64" height="64" alt="" /> <span>'.$conf['title'].'</span>', - 'accesskey="h" title="[H]"' - ) /* @todo: obviously don't use tpl_getFavicon, but make a new function (or use a config option?) */ ?></h1> + <h1><?php + // get logo either out of the template images folder or data/media folder + $logo = tpl_getMediaFile('logo.png'); + // get the size of the logo + $logoSize = getimagesize($_SERVER["DOCUMENT_ROOT"].$logo); + + // display logo and wiki title in a link to the home page + tpl_link( + wl(), + '<img src="'.$logo.'" '.$logoSize[3].' alt="" /> <span>'.$conf['title'].'</span>', + 'accesskey="h" title="[H]"' + ); + ?></h1> <?php if ($conf['tagline']): ?> <p class="claim"><?php echo $conf['tagline']; ?></p> <?php endif ?> -- cgit v1.2.3 From f52cb5c7a5a17f23d8c203a84b83c06d7fb34859 Mon Sep 17 00:00:00 2001 From: Anika Henke <anika@selfthinker.org> Date: Mon, 30 Jan 2012 01:54:08 +0000 Subject: unified Clarence's email address in file headers --- css/content.css | 2 +- css/design.css | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/css/content.css b/css/content.css index 626ad7727..432630b3a 100755 --- a/css/content.css +++ b/css/content.css @@ -3,7 +3,7 @@ * * @author Anika Henke <anika@selfthinker.org> * @author Andreas Gohr <andi@splitbrain.org> - * @author Clarence Lee <spicynoodles@gmail.com> + * @author Clarence Lee <clarencedglee@gmail.com> */ diff --git a/css/design.css b/css/design.css index a6e52f16f..f6175d9af 100755 --- a/css/design.css +++ b/css/design.css @@ -4,7 +4,7 @@ * * @author Anika Henke <anika@selfthinker.org> * @author Andreas Gohr <andi@splitbrain.org> - * @author Clarence Lee <spicynoodles@gmail.com> + * @author Clarence Lee <clarencedglee@gmail.com> */ /* header -- cgit v1.2.3 From f0b035a1de4d551c4a6cfc1d9314c36ad1d77a05 Mon Sep 17 00:00:00 2001 From: Anika Henke <anika@selfthinker.org> Date: Mon, 30 Jan 2012 01:54:48 +0000 Subject: updated template.info.txt --- template.info.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/template.info.txt b/template.info.txt index 891a89c0e..e049270ee 100644 --- a/template.info.txt +++ b/template.info.txt @@ -1,7 +1,7 @@ base dokuwiki -author Anika Henke, Clarence Lee +author Anika Henke, Andreas Gohr, Clarence Lee email andi@splitbrain.org -date devel +date 2012-01-30 name DokuWiki Template desc DokuWiki's default template 2012 url http://www.dokuwiki.org/template -- cgit v1.2.3 From 5739c373cd0c08eeb3668bca68b0def6645ba016 Mon Sep 17 00:00:00 2001 From: Anika Henke <anika@selfthinker.org> Date: Mon, 30 Jan 2012 01:55:19 +0000 Subject: added @todo to tpl_function to clear it later --- tpl_functions.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tpl_functions.php b/tpl_functions.php index 1ea3d0f92..c024f33e7 100755 --- a/tpl_functions.php +++ b/tpl_functions.php @@ -11,6 +11,8 @@ // must be run from within DokuWiki if (!defined('DOKU_INC')) die(); +/* @todo: add this function to the core and delete this file */ + /** * Include additional html file from conf directory if it exists, otherwise use * file in the template's root directory. -- cgit v1.2.3 From 378325f948e677b0253c6dc5e268aa753d3a10f1 Mon Sep 17 00:00:00 2001 From: Andreas Gohr <andi@splitbrain.org> Date: Mon, 30 Jan 2012 19:08:25 +0100 Subject: made the tpl_getMediaFile() function more flexible --- inc/template.php | 56 +++++++++++++++++++++++++++++++++++++++++--------------- 1 file changed, 41 insertions(+), 15 deletions(-) diff --git a/inc/template.php b/inc/template.php index f7a49f002..b338d2ce9 100644 --- a/inc/template.php +++ b/inc/template.php @@ -1459,22 +1459,44 @@ function tpl_flush(){ } /** - * Returns link to media file from data/media root directory if it exists, - * otherwise the one in the template's image directory. + * Tries to find a ressource file in the given locations. * - * @param string $fileName - file name of icon - * @param bool $abs - if to use absolute URL - * @author Anika Henke <anika@selfthinker.org> + * If a given location starts with a colon it is assumed to be a media + * file, otherwise it is assumed to be relative to the current template + * + * @param array $search locations to look at + * @param bool $abs if to use absolute URL + * @param arrayref $imginfo filled with getimagesize() + * @author Andreas Gohr <andi@splitbrain.org> */ -function tpl_getMediaFile($fileName, $abs=false) { - if (file_exists(mediaFN($fileName))) { - return ml($fileName, '', true, '', $abs); +function tpl_getMediaFile($search, $abs=false, &$imginfo=null){ + // loop through candidates until a match was found: + foreach($search as $img){ + if(substr($img,0,1) == ':'){ + $file = mediaFN($img); + $ismedia = true; + }else{ + $file = DOKU_TPLINC.$img; + $ismedia = false; + } + + if(file_exists($file)) break; } - if($abs) { - return DOKU_URL.substr(DOKU_TPL.'images/'.$fileName, strlen(DOKU_REL)); + // fetch image data if requested + if(!is_null($imginfo)){ + $imginfo = getimagesize($file); } - return DOKU_TPL.'images/'.$fileName; + + // build URL + if($ismedia){ + $url = ml($img, '', true, '', $abs); + }else{ + $url = DOKU_TPL.$img; + if($abs) $url = DOKU_URL.substr($url, strlen(DOKU_REL)); + } + + return $url; } /** @@ -1485,7 +1507,8 @@ function tpl_getMediaFile($fileName, $abs=false) { * @author Anika Henke <anika@selfthinker.org> */ function tpl_getFavicon($abs=false, $fileName='favicon.ico') { - return tpl_getMediaFile($fileName, $abs); + $look = array(":wiki:$fileName", ":$fileName", "images/$fileName"); + return tpl_getMediaFile($look, $abs); } /** @@ -1501,14 +1524,17 @@ function tpl_favicon($types=array('favicon')) { foreach ($types as $type) { switch($type) { case 'favicon': - $return .= '<link rel="shortcut icon" href="'.tpl_getMediaFile('favicon.ico').'" />'.NL; + $look = array(':wiki:favicon.ico', ':favicon.ico', 'images/favicon.ico'); + $return .= '<link rel="shortcut icon" href="'.tpl_getMediaFile($look).'" />'.NL; break; case 'mobile': - $return .= '<link rel="apple-touch-icon" href="'.tpl_getMediaFile('apple-touch-icon.png').'" />'.NL; + $look = array(':wiki:apple-touch-icon.png', ':apple-touch-icon.png', 'images/apple-touch-icon.ico'); + $return .= '<link rel="apple-touch-icon" href="'.tpl_getMediaFile($look).'" />'.NL; break; case 'generic': // ideal world solution, which doesn't work in any browser yet - $return .= '<link rel="icon" href="'.tpl_getMediaFile('icon.svg').'" type="image/svg+xml" />'.NL; + $look = array(':wiki:favicon.svg', ':favicon.svg', 'images/favicon.svg'); + $return .= '<link rel="icon" href="'.tpl_getMediaFile($look).'" type="image/svg+xml" />'.NL; break; } } -- cgit v1.2.3 From 8218bc6870ff6a83417e5a065e24e6707061a02f Mon Sep 17 00:00:00 2001 From: Andreas Gohr <andi@splitbrain.org> Date: Mon, 30 Jan 2012 19:17:32 +0100 Subject: fixed logo size setting. closes #36 --- tpl_header.php | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/tpl_header.php b/tpl_header.php index dea494aa0..ff16b44b9 100644 --- a/tpl_header.php +++ b/tpl_header.php @@ -11,9 +11,7 @@ <h1><?php // get logo either out of the template images folder or data/media folder - $logo = tpl_getMediaFile('logo.png'); - // get the size of the logo - $logoSize = getimagesize($_SERVER["DOCUMENT_ROOT"].$logo); + $logo = tpl_getMediaFile(array(':wiki:logo.png','images/logo.png'),false,$logoSize); // display logo and wiki title in a link to the home page tpl_link( -- cgit v1.2.3 From cfb7e4b9064206a1d04549594eef907f5cbb3690 Mon Sep 17 00:00:00 2001 From: Andreas Gohr <andi@splitbrain.org> Date: Mon, 30 Jan 2012 19:55:18 +0100 Subject: first attempt to fix media queries on modern smartphones (with large resolutions) --- css/mobile.css | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/css/mobile.css b/css/mobile.css index f3dcd3af6..023155766 100644 --- a/css/mobile.css +++ b/css/mobile.css @@ -5,8 +5,7 @@ * @author Anika Henke <anika@selfthinker.org> */ -@media only screen and (max-width: 480px), only screen and (max-device-width: 480px) { - +@media only screen and (max-width: 480px), only screen and (max-device-width: 960px) { /*____________ structure ____________*/ -- cgit v1.2.3 From c4766956646b53ab644ec6ddbd17d9cba07cf872 Mon Sep 17 00:00:00 2001 From: Andreas Gohr <andi@splitbrain.org> Date: Mon, 30 Jan 2012 20:38:41 +0100 Subject: DOKU_TPL* considered harmful Some plugins want to dynamically switch the template based on users, namspaces or the phase of the moon. Having fixed paths in a unchangable constant prevents this. This changes deprecates the DOKU_TPL* constants in favor of two new tpl_* functions that return the correct paths based on the $conf variables which can be changed from the DOKUWIKI_STARTED event. --- inc/init.php | 4 ++-- inc/template.php | 31 +++++++++++++++++++++++++++---- 2 files changed, 29 insertions(+), 6 deletions(-) diff --git a/inc/init.php b/inc/init.php index 14660b8d0..3aab0587b 100644 --- a/inc/init.php +++ b/inc/init.php @@ -118,11 +118,11 @@ if (!defined('DOKU_COOKIE')) define('DOKU_COOKIE', 'DW'.md5(DOKU_REL.(($conf['se // define main script if(!defined('DOKU_SCRIPT')) define('DOKU_SCRIPT','doku.php'); -// define Template baseURL +// DEPRECATED, use tpl_basedir() instead if(!defined('DOKU_TPL')) define('DOKU_TPL', DOKU_BASE.'lib/tpl/'.$conf['template'].'/'); -// define real Template directory +// DEPRECATED, use tpl_incdir() instead if(!defined('DOKU_TPLINC')) define('DOKU_TPLINC', DOKU_INC.'lib/tpl/'.$conf['template'].'/'); diff --git a/inc/template.php b/inc/template.php index b338d2ce9..28a6a387e 100644 --- a/inc/template.php +++ b/inc/template.php @@ -23,6 +23,29 @@ function template($tpl){ return DOKU_INC.'lib/tpl/default/'.$tpl; } + +/** + * Convenience function to access template dir from local FS + * + * This replaces the deprecated DOKU_TPLINC constant + * + * @author Andreas Gohr <andi@splitbrain.org> + */ +function tpl_incdir(){ + return DOKU_INC.'lib/tpl/'.$conf['template'].'/'; +} + +/** + * Convenience function to access template dir from web + * + * This replaces the deprecated DOKU_TPL constant + * + * @author Andreas Gohr <andi@splitbrain.org> + */ +function tpl_basedir(){ + return DOKU_BASE.'lib/tpl/'.$conf['template'].'/'; +} + /** * Print the content * @@ -1034,7 +1057,7 @@ function tpl_getConf($id){ */ function tpl_loadConfig(){ - $file = DOKU_TPLINC.'/conf/default.php'; + $file = tpl_incdir().'/conf/default.php'; $conf = array(); if (!@file_exists($file)) return false; @@ -1055,7 +1078,7 @@ function tpl_getLang($id){ static $lang = array(); if (count($lang) === 0){ - $path = DOKU_TPLINC.'lang/'; + $path = tpl_incdir().'lang/'; $lang = array(); @@ -1476,7 +1499,7 @@ function tpl_getMediaFile($search, $abs=false, &$imginfo=null){ $file = mediaFN($img); $ismedia = true; }else{ - $file = DOKU_TPLINC.$img; + $file = tpl_incdir().$img; $ismedia = false; } @@ -1492,7 +1515,7 @@ function tpl_getMediaFile($search, $abs=false, &$imginfo=null){ if($ismedia){ $url = ml($img, '', true, '', $abs); }else{ - $url = DOKU_TPL.$img; + $url = tpl_basedir().$img; if($abs) $url = DOKU_URL.substr($url, strlen(DOKU_REL)); } -- cgit v1.2.3 From 75b14482064ceb8495221b07b8991b787f520dad Mon Sep 17 00:00:00 2001 From: Andreas Gohr <andi@splitbrain.org> Date: Mon, 30 Jan 2012 20:42:59 +0100 Subject: added missing global statements tss.. --- inc/template.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/inc/template.php b/inc/template.php index 28a6a387e..c23fd14c1 100644 --- a/inc/template.php +++ b/inc/template.php @@ -32,6 +32,7 @@ function template($tpl){ * @author Andreas Gohr <andi@splitbrain.org> */ function tpl_incdir(){ + global $conf; return DOKU_INC.'lib/tpl/'.$conf['template'].'/'; } @@ -43,6 +44,7 @@ function tpl_incdir(){ * @author Andreas Gohr <andi@splitbrain.org> */ function tpl_basedir(){ + global $conf; return DOKU_BASE.'lib/tpl/'.$conf['template'].'/'; } -- cgit v1.2.3 From 7600eac12d0e51ba1a785cb75f4968f7d0c84748 Mon Sep 17 00:00:00 2001 From: Andreas Gohr <andi@splitbrain.org> Date: Mon, 30 Jan 2012 21:25:06 +0100 Subject: initialize variable otherwise it won't be filled --- tpl_header.php | 1 + 1 file changed, 1 insertion(+) diff --git a/tpl_header.php b/tpl_header.php index ff16b44b9..91d8876b9 100644 --- a/tpl_header.php +++ b/tpl_header.php @@ -11,6 +11,7 @@ <h1><?php // get logo either out of the template images folder or data/media folder + $logoSize = array(); $logo = tpl_getMediaFile(array(':wiki:logo.png','images/logo.png'),false,$logoSize); // display logo and wiki title in a link to the home page -- cgit v1.2.3 From ab232d68f701e1c13cc333ddc5fd42126b6335a4 Mon Sep 17 00:00:00 2001 From: Anika Henke <anika@selfthinker.org> Date: Tue, 31 Jan 2012 00:16:30 +0000 Subject: removed needless relative position on content (fixes #35) --- css/design.css | 1 - 1 file changed, 1 deletion(-) diff --git a/css/design.css b/css/design.css index f6175d9af..08088a380 100755 --- a/css/design.css +++ b/css/design.css @@ -237,7 +237,6 @@ ********************************************************************/ #dokuwiki__content { - position: relative; } .dokuwiki .pageId { -- cgit v1.2.3 From c4dda6afdfe780288bffaebcde485b32b91731d6 Mon Sep 17 00:00:00 2001 From: Anika Henke <anika@selfthinker.org> Date: Tue, 31 Jan 2012 00:21:07 +0000 Subject: fixed .curid to always highlight the current ID of the main/viewed page --- inc/parser/xhtml.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/inc/parser/xhtml.php b/inc/parser/xhtml.php index bfa22d066..8d1eb24c1 100644 --- a/inc/parser/xhtml.php +++ b/inc/parser/xhtml.php @@ -566,6 +566,7 @@ class Doku_Renderer_xhtml extends Doku_Renderer { function internallink($id, $name = NULL, $search=NULL,$returnonly=false,$linktype='content') { global $conf; global $ID; + global $INFO; $params = ''; $parts = explode('?', $id, 2); @@ -610,7 +611,7 @@ class Doku_Renderer_xhtml extends Doku_Renderer { $link['pre'] = ''; $link['suf'] = ''; // highlight link to current page - if ($id == $ID) { + if ($id == $INFO['id']) { $link['pre'] = '<span class="curid">'; $link['suf'] = '</span>'; } -- cgit v1.2.3 From cb4747e885fbd121842bdfdca30e2d4724f6c533 Mon Sep 17 00:00:00 2001 From: Anika Henke <anika@selfthinker.org> Date: Tue, 31 Jan 2012 00:31:30 +0000 Subject: remove bold from link to current page inside the main content (closes #31) --- css/design.css | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/css/design.css b/css/design.css index 08088a380..26b0ed811 100755 --- a/css/design.css +++ b/css/design.css @@ -296,6 +296,14 @@ margin: 0; } +.dokuwiki #dokuwiki__content span.curid a { + font-weight: normal; +} +.dokuwiki #dokuwiki__content strong span.curid a { + font-weight: bold; +} + + /*____________ changes to _edit ____________*/ .dokuwiki div.toolbar button.toolbutton { -- cgit v1.2.3 From 6d71d404c68e17a67755835215035de42a27e4d5 Mon Sep 17 00:00:00 2001 From: Anika Henke <anika@selfthinker.org> Date: Tue, 31 Jan 2012 01:51:36 +0000 Subject: added license for pagetool icons --- images/pagetools-license.txt | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 images/pagetools-license.txt diff --git a/images/pagetools-license.txt b/images/pagetools-license.txt new file mode 100644 index 000000000..299624c62 --- /dev/null +++ b/images/pagetools-license.txt @@ -0,0 +1,4 @@ +Icon set: iPhone toolbar icons +Designer: TheWorkingGroup.ca +License: Creative Commons Attribution-Share Alike License [http://creativecommons.org/licenses/by-sa/3.0/] +URL: http://blog.twg.ca/2009/09/free-iphone-toolbar-icons/ -- cgit v1.2.3 From 34a6fefb20a56d0eeb712f51c3a147f6c45f68e4 Mon Sep 17 00:00:00 2001 From: Anika Henke <anika@selfthinker.org> Date: Tue, 31 Jan 2012 02:06:46 +0000 Subject: removed outline from links (focus and active states are set differently anyway) --- css/basic.css | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/css/basic.css b/css/basic.css index bf2f22f75..34a6d5882 100755 --- a/css/basic.css +++ b/css/basic.css @@ -169,11 +169,12 @@ th { /*____________ links ____________*/ a { + outline: none; } a:link, a:visited { text-decoration: none; - color: __link__; /* §colour */ + color: __link__; } a:link:hover, a:visited:hover, @@ -183,14 +184,6 @@ a:link:active, a:visited:active { text-decoration: underline; } -a:link:focus, -a:visited:focus { - outline: 1px dotted; -} -a:link:active, -a:visited:active { - color: #c00; /* §colour */ -} /*____________ misc ____________*/ -- cgit v1.2.3 From 8374df7d1ec0a30f089f6a275092d4df2845c661 Mon Sep 17 00:00:00 2001 From: Anika Henke <anika@selfthinker.org> Date: Tue, 31 Jan 2012 11:30:58 +0000 Subject: changed link colours (#22) --- images/pagetools-sprite.png | Bin 14139 -> 14593 bytes images/pagetools-sprite.xcf | Bin 34360 -> 34332 bytes images/pagetools.xcf | Bin 14630 -> 14630 bytes style.ini | 9 +++++---- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/images/pagetools-sprite.png b/images/pagetools-sprite.png index b1a62cacb..54831a0f1 100644 Binary files a/images/pagetools-sprite.png and b/images/pagetools-sprite.png differ diff --git a/images/pagetools-sprite.xcf b/images/pagetools-sprite.xcf index 062dcae5d..e7c130240 100644 Binary files a/images/pagetools-sprite.xcf and b/images/pagetools-sprite.xcf differ diff --git a/images/pagetools.xcf b/images/pagetools.xcf index 980d20363..89d971f50 100644 Binary files a/images/pagetools.xcf and b/images/pagetools.xcf differ diff --git a/style.ini b/style.ini index bbf348dde..5743ea0cb 100755 --- a/style.ini +++ b/style.ini @@ -47,7 +47,6 @@ css/print.css = print ; main text and background colors __text__ = "#333" __background__ = "#fff" -__background_site__ = "#fbfaf9" ; alternative text and background colors __text_alt__ = "#999" __background_alt__ = "#eee" @@ -59,10 +58,12 @@ __border__ = "#ccc" ;-------------------------------------------------------------------------- +__background_site__ = "#fbfaf9" + ; these are used for links -__link__ = "#627D9A" -__existing__ = "#090" -__missing__ = "#f30" +__link__ = "#2b73b7" +__existing__ = "#080" +__missing__ = "#d30" ; highlighting search snippets __highlight__ = "#ff9" -- cgit v1.2.3 From a39be6a2d26f47529e34594a5eae95a5c750a7e1 Mon Sep 17 00:00:00 2001 From: Anika Henke <anika@selfthinker.org> Date: Tue, 31 Jan 2012 23:30:04 +0000 Subject: toned down active colour of pagetools a bit (#22) --- images/pagetools-sprite.png | Bin 14593 -> 14507 bytes images/pagetools-sprite.xcf | Bin 34332 -> 34257 bytes images/pagetools.xcf | Bin 14630 -> 14393 bytes 3 files changed, 0 insertions(+), 0 deletions(-) diff --git a/images/pagetools-sprite.png b/images/pagetools-sprite.png index 54831a0f1..a0f4036ff 100644 Binary files a/images/pagetools-sprite.png and b/images/pagetools-sprite.png differ diff --git a/images/pagetools-sprite.xcf b/images/pagetools-sprite.xcf index e7c130240..07c1d83fb 100644 Binary files a/images/pagetools-sprite.xcf and b/images/pagetools-sprite.xcf differ diff --git a/images/pagetools.xcf b/images/pagetools.xcf index 89d971f50..034b39a42 100644 Binary files a/images/pagetools.xcf and b/images/pagetools.xcf differ -- cgit v1.2.3 From 81aca18e6e88c08386c11592dbf4650114aba04f Mon Sep 17 00:00:00 2001 From: Andreas Gohr <andi@splitbrain.org> Date: Wed, 1 Feb 2012 20:07:04 +0100 Subject: removed some more occurances of DOKU_TPL* --- lib/exe/css.php | 4 ++-- lib/exe/js.php | 4 ++-- lib/exe/opensearch.php | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/exe/css.php b/lib/exe/css.php index d54e2e46c..69b512205 100644 --- a/lib/exe/css.php +++ b/lib/exe/css.php @@ -41,8 +41,8 @@ function css_out(){ $tplinc = DOKU_INC.'lib/tpl/'.$tpl.'/'; $tpldir = DOKU_BASE.'lib/tpl/'.$tpl.'/'; }else{ - $tplinc = DOKU_TPLINC; - $tpldir = DOKU_TPL; + $tplinc = tpl_incdir(); + $tpldir = tpl_basedir(); } // The generated script depends on some dynamic options diff --git a/lib/exe/js.php b/lib/exe/js.php index b7f2fd222..963eebd5f 100644 --- a/lib/exe/js.php +++ b/lib/exe/js.php @@ -65,7 +65,7 @@ function js_out(){ # disabled for FS#1958 DOKU_INC.'lib/scripts/hotkeys.js', DOKU_INC.'lib/scripts/behaviour.js', DOKU_INC.'lib/scripts/page.js', - DOKU_TPLINC.'script.js', + tpl_incdir().'script.js', ); // add possible plugin scripts and userscript @@ -87,7 +87,7 @@ function js_out(){ // add some global variables print "var DOKU_BASE = '".DOKU_BASE."';"; - print "var DOKU_TPL = '".DOKU_TPL."';"; + print "var DOKU_TPL = '".tpl_basedir()."';"; // FIXME: Move those to JSINFO print "var DOKU_UHN = ".((int) useHeading('navigation')).";"; print "var DOKU_UHC = ".((int) useHeading('content')).";"; diff --git a/lib/exe/opensearch.php b/lib/exe/opensearch.php index 03a1632c4..73939c347 100644 --- a/lib/exe/opensearch.php +++ b/lib/exe/opensearch.php @@ -16,9 +16,9 @@ require_once(DOKU_INC.'inc/init.php'); // try to be clever about the favicon location if(file_exists(DOKU_INC.'favicon.ico')){ $ico = DOKU_URL.'favicon.ico'; -}elseif(file_exists(DOKU_TPLINC.'images/favicon.ico')){ +}elseif(file_exists(tpl_incdir().'images/favicon.ico')){ $ico = DOKU_URL.'lib/tpl/'.$conf['template'].'/images/favicon.ico'; -}elseif(file_exists(DOKU_TPLINC.'favicon.ico')){ +}elseif(file_exists(tpl_incdir().'favicon.ico')){ $ico = DOKU_URL.'lib/tpl/'.$conf['template'].'/favicon.ico'; }else{ $ico = DOKU_URL.'lib/tpl/default/images/favicon.ico'; -- cgit v1.2.3 From bc9d46afa580ee1191b02e2fe3b03fd863045b8b Mon Sep 17 00:00:00 2001 From: Andreas Gohr <andi@splitbrain.org> Date: Wed, 1 Feb 2012 20:24:11 +0100 Subject: some more DOKU_TPL removal --- lib/plugins/config/admin.php | 6 +++--- lib/plugins/config/settings/config.class.php | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/lib/plugins/config/admin.php b/lib/plugins/config/admin.php index 64906171d..c883e7b6a 100644 --- a/lib/plugins/config/admin.php +++ b/lib/plugins/config/admin.php @@ -270,10 +270,10 @@ class admin_plugin_config extends DokuWiki_Admin_Plugin { // the same for the active template $tpl = $conf['template']; - if (@file_exists(DOKU_TPLINC.$enlangfile)){ + if (@file_exists(tpl_incdir().$enlangfile)){ $lang = array(); - @include(DOKU_TPLINC.$enlangfile); - if ($conf['lang'] != 'en') @include(DOKU_TPLINC.$langfile); + @include(tpl_incdir().$enlangfile); + if ($conf['lang'] != 'en') @include(tpl_incdir().$langfile); foreach ($lang as $key => $value){ $this->lang['tpl'.CM_KEYMARKER.$tpl.CM_KEYMARKER.$key] = $value; } diff --git a/lib/plugins/config/settings/config.class.php b/lib/plugins/config/settings/config.class.php index adf7d217a..1cdab607f 100644 --- a/lib/plugins/config/settings/config.class.php +++ b/lib/plugins/config/settings/config.class.php @@ -279,10 +279,10 @@ if (!class_exists('configuration')) { } // the same for the active template - if (@file_exists(DOKU_TPLINC.$file)){ + if (@file_exists(tpl_incdir().$file)){ $meta = array(); - @include(DOKU_TPLINC.$file); - @include(DOKU_TPLINC.$class); + @include(tpl_incdir().$file); + @include(tpl_incdir().$class); if (!empty($meta)) { $metadata['tpl'.CM_KEYMARKER.$tpl.CM_KEYMARKER.'template_settings_name'] = array('fieldset'); } @@ -314,9 +314,9 @@ if (!class_exists('configuration')) { } // the same for the active template - if (@file_exists(DOKU_TPLINC.$file)){ + if (@file_exists(tpl_incdir().$file)){ $conf = array(); - @include(DOKU_TPLINC.$file); + @include(tpl_incdir().$file); foreach ($conf as $key => $value){ $default['tpl'.CM_KEYMARKER.$tpl.CM_KEYMARKER.$key] = $value; } -- cgit v1.2.3 From 2203da5b13d5062626a6ecd6b599fb42dc415a06 Mon Sep 17 00:00:00 2001 From: Andreas Gohr <andi@splitbrain.org> Date: Wed, 1 Feb 2012 20:35:23 +0100 Subject: increased XMLRPC API version for 1d667b4 --- lib/exe/xmlrpc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/exe/xmlrpc.php b/lib/exe/xmlrpc.php index 61e6f1e95..1264ff333 100644 --- a/lib/exe/xmlrpc.php +++ b/lib/exe/xmlrpc.php @@ -7,7 +7,7 @@ if(isset($HTTP_RAW_POST_DATA)) $HTTP_RAW_POST_DATA = trim($HTTP_RAW_POST_DATA); /** * Increased whenever the API is changed */ -define('DOKU_XMLRPC_API_VERSION', 6); +define('DOKU_XMLRPC_API_VERSION', 7); require_once(DOKU_INC.'inc/init.php'); session_write_close(); //close session -- cgit v1.2.3 From 3c9ecc9e229801c19b095e61cc7c8a43b70ba706 Mon Sep 17 00:00:00 2001 From: Anika Henke <anika@selfthinker.org> Date: Wed, 1 Feb 2012 23:38:36 +0000 Subject: added includes for sidebar header and footer (closes #41) and moved page header and footer inside .page div --- detail.php | 8 ++++---- main.php | 9 ++++++--- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/detail.php b/detail.php index cdda77ac6..287827253 100755 --- a/detail.php +++ b/detail.php @@ -47,14 +47,14 @@ $showSidebar = $conf['sidebar'] && page_exists($conf['sidebar']) && ($ACT=='show <!-- ********** CONTENT ********** --> <div id="dokuwiki__content"><div class="pad group"> - <?php tpl_flush() /* flush the output buffer */ ?> - <?php _tpl_include('pageheader.html') ?> <?php if(!$ERROR): ?> <div class="pageId"><span><?php echo hsc(tpl_img_getTag('IPTC.Headline',$IMG)); ?></span></div> <?php endif; ?> <div class="page group"> + <?php tpl_flush() /* flush the output buffer */ ?> + <?php _tpl_include('pageheader.html') ?> <!-- detail start --> <?php if($ERROR): @@ -102,13 +102,13 @@ $showSidebar = $conf['sidebar'] && page_exists($conf['sidebar']) && ($ACT=='show <?php endif; ?> </div> <!-- detail stop --> + <?php _tpl_include('pagefooter.html') ?> + <?php tpl_flush() ?> <?php /* doesn't make sense like this; @todo: maybe add tpl_imginfo()? <div class="docInfo"><?php tpl_pageinfo(); ?></div> */ ?> - <?php tpl_flush() ?> - <?php _tpl_include('pagefooter.html') ?> </div></div><!-- /content --> <hr class="a11y" /> diff --git a/main.php b/main.php index b7985d560..84334a4db 100755 --- a/main.php +++ b/main.php @@ -45,27 +45,30 @@ $showSidebar = $conf['sidebar'] && page_exists($conf['sidebar']) && ($ACT=='show <?php if($showSidebar): ?> <!-- ********** ASIDE ********** --> <div id="dokuwiki__aside"><div class="pad include group"> + <?php tpl_flush() /* flush the output buffer */ ?> + <?php _tpl_include('sidebarheader.html') ?> <?php tpl_include_page($conf['sidebar']) /* includes the given wiki page */ ?> + <?php _tpl_include('sidebarfooter.html') ?> </div></div><!-- /aside --> <?php endif; ?> <!-- ********** CONTENT ********** --> <div id="dokuwiki__content"><div class="pad group"> - <?php tpl_flush() /* flush the output buffer */ ?> - <?php _tpl_include('pageheader.html') ?> <div class="pageId"><span><?php echo hsc($ID) ?></span></div> <div class="page group"> + <?php tpl_flush() ?> + <?php _tpl_include('pageheader.html') ?> <!-- wikipage start --> <?php tpl_content() /* the main content */ ?> <!-- wikipage stop --> + <?php _tpl_include('pagefooter.html') ?> </div> <div class="docInfo"><?php tpl_pageinfo() /* 'Last modified' etc */ ?></div> <?php tpl_flush() ?> - <?php _tpl_include('pagefooter.html') ?> </div></div><!-- /content --> <hr class="a11y" /> -- cgit v1.2.3 From 2d502fc8228ce3c356f07427fab65089402ff45b Mon Sep 17 00:00:00 2001 From: Anika Henke <anika@selfthinker.org> Date: Wed, 1 Feb 2012 23:51:56 +0000 Subject: typo --- css/_toc.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/css/_toc.css b/css/_toc.css index 5b71de3ec..b78817523 100755 --- a/css/_toc.css +++ b/css/_toc.css @@ -60,7 +60,7 @@ } -/* sitemap (and backlinkss) +/* sitemap (and backlinks) ********************************************************************/ .dokuwiki ul.idx { -- cgit v1.2.3 From 1016b7afcf78b81d84a346b7cf2e9bf9d4bcee0d Mon Sep 17 00:00:00 2001 From: Anika Henke <anika@selfthinker.org> Date: Wed, 1 Feb 2012 23:53:00 +0000 Subject: made large tables scrollable (fixes #40) --- css/content.css | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/css/content.css b/css/content.css index 432630b3a..18fda7ea8 100755 --- a/css/content.css +++ b/css/content.css @@ -57,6 +57,15 @@ /*____________ tables ____________*/ +.dokuwiki div.table { + width: 100%; + overflow-x: auto; + margin-bottom: 1.4em; +} +.dokuwiki div.table table.inline { + margin-bottom: 0; +} + .dokuwiki table.inline { min-width: 50%; border-width: 0; -- cgit v1.2.3 From 6c31e87a91958a9295c89e0d426be118ba59e95d Mon Sep 17 00:00:00 2001 From: Anika Henke <anika@selfthinker.org> Date: Thu, 2 Feb 2012 00:32:08 +0000 Subject: improved search box and action dropdown spacing in mobile view --- css/basic.css | 3 +++ css/design.css | 1 + css/mobile.css | 10 ++-------- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/css/basic.css b/css/basic.css index 34a6d5882..ae9be499e 100755 --- a/css/basic.css +++ b/css/basic.css @@ -289,6 +289,9 @@ option { line-height: 1; margin: 0; vertical-align: middle; + -moz-box-sizing: border-box; + -webkit-box-sizing: border-box; + box-sizing: border-box; } optgroup { diff --git a/css/design.css b/css/design.css index 26b0ed811..22e035d43 100755 --- a/css/design.css +++ b/css/design.css @@ -130,6 +130,7 @@ text-indent: -99999px; margin-left: -20px; box-shadow: none; + padding: 0; } #dokuwiki__sitetools ul { diff --git a/css/mobile.css b/css/mobile.css index 023155766..cbadc70fd 100644 --- a/css/mobile.css +++ b/css/mobile.css @@ -79,15 +79,9 @@ float: left; margin: 0 .2em .2em 0; width: 49%; - position: relative; } #dokuwiki__sitetools form.search input.edit { - width: 90% !important; -} -#dokuwiki__sitetools form.search input.button { - position: absolute; - top: .2em; - right: .2em; + width: 100% !important; } .dokuwiki form.search div.ajax_qsearch { display: none !important; @@ -102,7 +96,7 @@ width: 49%; } #dokuwiki__header .mobileTools select { - padding: .25em .1em; + padding: .3em .1em; width: 100% !important; } -- cgit v1.2.3 From cf5b6034aaad672509c0083f0b265f1f6842b8db Mon Sep 17 00:00:00 2001 From: Anika Henke <anika@selfthinker.org> Date: Thu, 2 Feb 2012 01:20:48 +0000 Subject: fixed search input issue caused by previous commit --- css/design.css | 2 +- css/rtl.css | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/css/design.css b/css/design.css index 22e035d43..19821d401 100755 --- a/css/design.css +++ b/css/design.css @@ -119,7 +119,7 @@ position: relative; } #dokuwiki__sitetools form.search input.edit { - width: 16em; + width: 18em; padding: .35em 22px .35em .1em; } #dokuwiki__sitetools form.search input.button { diff --git a/css/rtl.css b/css/rtl.css index d25ba3e3e..790545a1b 100755 --- a/css/rtl.css +++ b/css/rtl.css @@ -551,10 +551,6 @@ form#subscribe__form fieldset { float: right; margin: 0 0 .2em .2em; } -#dokuwiki__sitetools form.search input.button { - right: auto; - left: .2em; -} #dokuwiki__header .mobileTools { float: left; -- cgit v1.2.3 From 8e0ab9e4c1050880f5aea75bb277bd7ad6a05287 Mon Sep 17 00:00:00 2001 From: Anika Henke <anika@selfthinker.org> Date: Thu, 2 Feb 2012 01:27:55 +0000 Subject: increased site width a bit (#45) --- style.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/style.ini b/style.ini index 5743ea0cb..8ac4fbe31 100755 --- a/style.ini +++ b/style.ini @@ -69,5 +69,5 @@ __missing__ = "#d30" __highlight__ = "#ff9" ; sidebar width -__site_width__ = "72em" +__site_width__ = "75em" __sidebar_width__ = "16em" -- cgit v1.2.3 From 40d429f51adcff41f289a7961b5d298d2190f3ef Mon Sep 17 00:00:00 2001 From: Begina Felicysym <begina.felicysym@wp.pl> Date: Thu, 2 Feb 2012 20:48:01 +0100 Subject: Polish language update --- inc/lang/pl/lang.php | 5 +++++ lib/plugins/config/lang/pl/lang.php | 2 ++ 2 files changed, 7 insertions(+) diff --git a/inc/lang/pl/lang.php b/inc/lang/pl/lang.php index 26e1bd5f5..42af3d3c4 100644 --- a/inc/lang/pl/lang.php +++ b/inc/lang/pl/lang.php @@ -192,6 +192,11 @@ $lang['external_edit'] = 'edycja zewnętrzna'; $lang['summary'] = 'Opis zmian'; $lang['noflash'] = 'Plugin <a href="http://www.adobe.com/products/flashplayer/">Adobe Flash Plugin</a> jest niezbędny do obejrzenia tej zawartości.'; $lang['download'] = 'Pobierz zrzut'; +$lang['tools'] = 'Narzędzia'; +$lang['user_tools'] = 'Narzędzia użytkownika'; +$lang['site_tools'] = 'Narzędzia witryny'; +$lang['page_tools'] = 'Narzędzia strony'; +$lang['skip_to_content'] = 'przejście do zawartości'; $lang['mail_newpage'] = 'Strona dodana:'; $lang['mail_changed'] = 'Strona zmieniona:'; $lang['mail_subscribe_list'] = 'Zmienione strony w katalogu:'; diff --git a/lib/plugins/config/lang/pl/lang.php b/lib/plugins/config/lang/pl/lang.php index 62c55d328..a04f45c87 100644 --- a/lib/plugins/config/lang/pl/lang.php +++ b/lib/plugins/config/lang/pl/lang.php @@ -52,6 +52,8 @@ $lang['cookiedir'] = 'Ścieżka plików ciasteczek. Zostaw puste by $lang['start'] = 'Tytuł strony początkowej'; $lang['title'] = 'Tytuł wiki'; $lang['template'] = 'Motyw'; +$lang['tagline'] = 'Motto (jeśli szablon daje taką możliwość)'; +$lang['sidebar'] = 'Nazwa strony paska bocznego (jeśli szablon je obsługuje), puste pole wyłącza pasek boczny'; $lang['license'] = 'Pod jaką licencją publikować treści wiki?'; $lang['fullpath'] = 'Wyświetlanie pełnych ścieżek'; $lang['recent'] = 'Ilość ostatnich zmian'; -- cgit v1.2.3 From ae6cce187876439c77b53ebd2ae61976274f4a11 Mon Sep 17 00:00:00 2001 From: Matej Urban <matej.urban@gmail.com> Date: Thu, 2 Feb 2012 20:49:20 +0100 Subject: Slovak language update --- inc/lang/sl/lang.php | 59 ++++++++++++++++++++++++++-- inc/lang/sl/locked.txt | 2 +- inc/lang/sl/stopwords.txt | 6 +-- lib/plugins/acl/lang/sl/help.txt | 10 ++--- lib/plugins/acl/lang/sl/lang.php | 2 +- lib/plugins/config/lang/sl/lang.php | 15 ++++--- lib/plugins/plugin/lang/sl/admin_plugin.txt | 2 +- lib/plugins/plugin/lang/sl/lang.php | 2 +- lib/plugins/popularity/lang/sl/intro.txt | 10 ++--- lib/plugins/popularity/lang/sl/submitted.txt | 4 +- lib/plugins/revert/lang/sl/intro.txt | 2 +- lib/plugins/usermanager/lang/sl/delete.txt | 2 +- 12 files changed, 86 insertions(+), 30 deletions(-) diff --git a/inc/lang/sl/lang.php b/inc/lang/sl/lang.php index d802aa8f0..00a349af6 100644 --- a/inc/lang/sl/lang.php +++ b/inc/lang/sl/lang.php @@ -48,6 +48,9 @@ $lang['btn_draft'] = 'Uredi osnutek'; $lang['btn_recover'] = 'Obnovi osnutek'; $lang['btn_draftdel'] = 'Izbriši osnutek'; $lang['btn_revert'] = 'Povrni'; +$lang['btn_register'] = 'Prijava'; +$lang['btn_apply'] = 'Uveljavi'; +$lang['btn_media'] = 'Urejevalnik predstavnih vsebin'; $lang['loggedinas'] = 'Prijava kot'; $lang['user'] = 'Uporabniško ime'; $lang['pass'] = 'Geslo'; @@ -57,7 +60,6 @@ $lang['passchk'] = 'Ponovi novo geslo'; $lang['remember'] = 'Zapomni si me'; $lang['fullname'] = 'Pravo ime'; $lang['email'] = 'Elektronski naslov'; -$lang['register'] = 'Vpis računa'; $lang['profile'] = 'Uporabniški profil'; $lang['badlogin'] = 'Uporabniško ime ali geslo je napačno.'; $lang['minoredit'] = 'Manjše spremembe'; @@ -72,12 +74,12 @@ $lang['regbadmail'] = 'Videti je, da je naveden elektronski naslov ne $lang['regbadpass'] = 'Gesli nista enaki. Poskusite znova.'; $lang['regpwmail'] = 'Geslo za DokuWiki'; $lang['reghere'] = 'Nimate še računa? Vpišite se za nov račun.'; -$lang['profna'] = 'Wiki ne podpira spreminjanja profila.'; +$lang['profna'] = 'DokuWiki ne podpira spreminjanja profila.'; $lang['profnochange'] = 'Brez sprememb.'; $lang['profnoempty'] = 'Prazno polje elektronskega naslova ali imena ni dovoljeno.'; $lang['profchanged'] = 'Uporabniški profil je uspešno posodobljen.'; $lang['pwdforget'] = 'Ali ste pozabili geslo? Pridobite si novo geslo.'; -$lang['resendna'] = 'Wiki ne podpira možnosti ponovnega pošiljanja gesel.'; +$lang['resendna'] = 'DokuWiki ne podpira možnosti ponovnega pošiljanja gesel.'; $lang['resendpwd'] = 'Pošlji novo geslo za'; $lang['resendpwdmissing'] = 'Izpolniti je treba vsa polja.'; $lang['resendpwdnouser'] = 'Podanega uporabniškega imena v podatkovni zbirki ni mogoče najti.'; @@ -93,7 +95,7 @@ $lang['txt_filename'] = 'Pošlji z imenom (izborno)'; $lang['txt_overwrt'] = 'Prepiši obstoječo datoteko'; $lang['lockedby'] = 'Trenutno je zaklenjeno s strani'; $lang['lockexpire'] = 'Zaklep preteče ob'; -$lang['js']['willexpire'] = 'Zaklep za urejevanje bo pretekel čez eno minuto.\nV izogib sporom, uporabite predogled, da se merilnik časa za zaklep ponastavi.'; +$lang['js']['willexpire'] = 'Zaklep za urejevanje bo pretekel čez eno minuto.\nV izogib sporom, uporabite predogled, da se merilnik časa za zaklep ponastavi.'; $lang['js']['notsavedyet'] = 'Neshranjene spremembe bodo izgubljene.'; $lang['js']['searchmedia'] = 'Poišči datoteke'; $lang['js']['keepopen'] = 'Od izbiri ohrani okno odprto'; @@ -123,6 +125,16 @@ $lang['js']['nosmblinks'] = 'Povezovanje do souporabnih datotek sistema Win $lang['js']['linkwiz'] = 'Čarovnik za povezave'; $lang['js']['linkto'] = 'Poveži na:'; $lang['js']['del_confirm'] = 'Ali naj se res izbrišejo izbrani predmeti?'; +$lang['js']['restore_confirm'] = 'Ali naj se koda obnovi na to različico?'; +$lang['js']['media_diff'] = 'Razlike:'; +$lang['js']['media_diff_both'] = 'Eno ob drugem'; +$lang['js']['media_diff_opacity'] = 'Prosojno'; +$lang['js']['media_select'] = 'Izbor datotek ...'; +$lang['js']['media_upload_btn'] = 'Naloži'; +$lang['js']['media_done_btn'] = 'Končano'; +$lang['js']['media_drop'] = 'Spusti datoteke za nalaganje.'; +$lang['js']['media_cancel'] = 'odstrani'; +$lang['js']['media_overwrt'] = 'Prepiši obstoječe datoteke'; $lang['rssfailed'] = 'Prišlo je do napake med pridobivanjem vira: '; $lang['nothingfound'] = 'Ni najdenih predmetov.'; $lang['mediaselect'] = 'Predstavne datoteke'; @@ -157,6 +169,9 @@ $lang['yours'] = 'Vaša različica'; $lang['diff'] = 'Pokaži razlike s trenutno različico'; $lang['diff2'] = 'Pokaži razlike med izbranimi različicami.'; $lang['difflink'] = 'Poveži s tem pogledom primerjave.'; +$lang['diff_type'] = 'Razlike:'; +$lang['diff_inline'] = 'V besedilu'; +$lang['diff_side'] = 'Eno ob drugem'; $lang['line'] = 'Vrstica'; $lang['breadcrumb'] = 'Sled'; $lang['youarehere'] = 'Trenutno dejavna stran'; @@ -169,11 +184,20 @@ $lang['external_edit'] = 'urejanje v zunanjem urejevalniku'; $lang['summary'] = 'Povzetek urejanja'; $lang['noflash'] = 'Za prikaz vsebine je treba namestiti <a href="http://www.adobe.com/products/flashplayer/">Adobe Flash Plugin</a>'; $lang['download'] = 'Naloži izrezek'; +$lang['tools'] = 'Orodja'; +$lang['user_tools'] = 'Uporabniška orodja'; +$lang['site_tools'] = 'Orodja spletišča'; +$lang['page_tools'] = 'Orodja strani'; +$lang['skip_to_content'] = 'preskoči na vsebino'; $lang['mail_newpage'] = '[DokuWiki] stran dodana:'; $lang['mail_changed'] = '[DokuWiki] stran spremenjena:'; $lang['mail_subscribe_list'] = 'strani s spremenjenim imenom:'; $lang['mail_new_user'] = 'nov uporabnik:'; $lang['mail_upload'] = 'naložena datoteka:'; +$lang['changes_type'] = 'Poglej spremembe'; +$lang['pages_changes'] = 'Strani'; +$lang['media_changes'] = 'Predstavne datoteke'; +$lang['both_changes'] = 'Strani in predstavne datoteke'; $lang['qb_bold'] = 'Krepko besedilo'; $lang['qb_italic'] = 'Ležeče besedilo'; $lang['qb_underl'] = 'Podčrtano besedilo'; @@ -214,6 +238,9 @@ $lang['img_copyr'] = 'Avtorska pravica'; $lang['img_format'] = 'Zapis'; $lang['img_camera'] = 'Fotoaparat'; $lang['img_keywords'] = 'Ključne besede'; +$lang['img_width'] = 'Širina'; +$lang['img_height'] = 'Višina'; +$lang['img_manager'] = 'Poglej v urejevalniku predstavnih vsebin'; $lang['subscr_subscribe_success'] = 'Uporabniški račun %s je dodan na seznam naročnin na %s'; $lang['subscr_subscribe_error'] = 'Napaka med dodajanjem %s na seznam naročnin na %s'; $lang['subscr_subscribe_noaddress'] = 'S trenutnimi prijavnimi podatki ni povezanega elektronskega naslova, zato uporabniškega računa ni mogoče dodati na seznam naročnikov.'; @@ -263,3 +290,27 @@ $lang['hours'] = '%d ur nazaj'; $lang['minutes'] = '%d minut nazaj'; $lang['seconds'] = '%d sekund nazaj'; $lang['wordblock'] = 'Spremembe niso shranjene, ker je v vsebini navedeno neželeno besedilo (spam).'; +$lang['media_uploadtab'] = 'Naloži'; +$lang['media_searchtab'] = 'Poišči'; +$lang['media_file'] = 'Datoteka'; +$lang['media_viewtab'] = 'Pogled'; +$lang['media_edittab'] = 'Uredi'; +$lang['media_historytab'] = 'Zgodovina'; +$lang['media_list_thumbs'] = 'Sličice'; +$lang['media_list_rows'] = 'Vrstice'; +$lang['media_sort_name'] = 'Ime'; +$lang['media_sort_date'] = 'Datum'; +$lang['media_namespaces'] = 'Izbor imenskega prostora'; +$lang['media_files'] = 'Datoteke v %s'; +$lang['media_upload'] = 'Naloži v %s'; +$lang['media_search'] = 'Poišči v %s'; +$lang['media_view'] = '%s'; +$lang['media_viewold'] = '%s pri %s'; +$lang['media_edit'] = 'Uredi %s'; +$lang['media_history'] = 'Zgodovina %s'; +$lang['media_meta_edited'] = 'metapodatki so urejeni'; +$lang['media_perm_read'] = 'Ni ustreznih dovoljenj za branje datotek.'; +$lang['media_perm_upload'] = 'Ni ustreznih dovoljenj za nalaganje datotek.'; +$lang['media_update'] = 'Naloži novo različico'; +$lang['media_restore'] = 'Obnovi to različico'; +$lang['plugin_install_err'] = 'Vstavek ni pravilno nameščen. Preimenujte mapo vstavka\'%s\' v \'%s\'.'; diff --git a/inc/lang/sl/locked.txt b/inc/lang/sl/locked.txt index d51e940b7..cc693d3fa 100644 --- a/inc/lang/sl/locked.txt +++ b/inc/lang/sl/locked.txt @@ -1,3 +1,3 @@ ====== Stran je zaklenjena ====== -Stran je zaklenjenjena za urejanje. Počakati je treba, da zaklep strani poteče. +Stran je zaklenjena za urejanje. Počakati je treba, da zaklep strani poteče. diff --git a/inc/lang/sl/stopwords.txt b/inc/lang/sl/stopwords.txt index 5d61539e7..8eed2daa6 100644 --- a/inc/lang/sl/stopwords.txt +++ b/inc/lang/sl/stopwords.txt @@ -1,7 +1,7 @@ # To je seznam besed, ki jih ustvarjalnik kazala prezre. Seznam je sestavljen iz -# besede, ki so zapisane vsaka v svoji vrstici. Datoteka mora biti zapisana s konnim -# UNIX znakom vrstice. Besede kraje od treh znakov so iz kazala izloene samodejno -# zaradi preglednosti. Seznam se s bo s asom spreminjal in dopolnjeval. +# besede, ki so zapisane vsaka v svoji vrstici. Datoteka mora biti zapisana s končnim +# UNIX znakom vrstice. Besede krajše od treh znakov so iz kazala izločene samodejno +# zaradi preglednosti. Seznam se s bo s časom spreminjal in dopolnjeval. moja moje moji diff --git a/lib/plugins/acl/lang/sl/help.txt b/lib/plugins/acl/lang/sl/help.txt index eada41c29..ff096ae0e 100644 --- a/lib/plugins/acl/lang/sl/help.txt +++ b/lib/plugins/acl/lang/sl/help.txt @@ -1,11 +1,11 @@ -=== Hitra pomo === +=== Hitra pomoč === -Na tej strani je mogoe dodajati, odstranjevati in spreminjati dovoljenja za delo z wiki stranmi in imenskimi prostori. +Na tej strani je mogoče dodajati, odstranjevati in spreminjati dovoljenja za delo z wiki stranmi in imenskimi prostori. Na veli strani so izpisani vsi imenski prostori in strani. -Na obrazcu zgoraj je mogoe pregledovati in spreminjati dovoljenja za izbranega uporabnika ali skupino. +Na obrazcu zgoraj je mogoče pregledovati in spreminjati dovoljenja za izbranega uporabnika ali skupino. -V preglednici spodaj so prikazana vsa pravila nadzora. Ta je mogoe hitro spreminjati ali brisati. +V preglednici spodaj so prikazana vsa pravila nadzora. Ta je mogoče hitro spreminjati ali brisati. -Ve podrobnosti o delovanju nadzora dostopa sistema DokuWiki je mogoe najti v [[doku>acl|uradni dokumentaciji ACL]]. +Več podrobnosti o delovanju nadzora dostopa sistema DokuWiki je mogoče najti v [[doku>acl|uradni dokumentaciji ACL]]. diff --git a/lib/plugins/acl/lang/sl/lang.php b/lib/plugins/acl/lang/sl/lang.php index 3fb391570..44e45e491 100644 --- a/lib/plugins/acl/lang/sl/lang.php +++ b/lib/plugins/acl/lang/sl/lang.php @@ -5,7 +5,7 @@ * @author Dejan Levec <webphp@gmail.com> * @author Boštjan Seničar <senicar@gmail.com> * @author Gregor Skumavc (grega.skumavc@gmail.com) - * @author Matej Urbančič (mateju@svn.gnome.org) + * @author Matej Urbančič (mateju@svn.gnome.org) */ $lang['admin_acl'] = 'Upravljanje dostopa'; $lang['acl_group'] = 'Skupina'; diff --git a/lib/plugins/config/lang/sl/lang.php b/lib/plugins/config/lang/sl/lang.php index dadd01595..ba4836823 100644 --- a/lib/plugins/config/lang/sl/lang.php +++ b/lib/plugins/config/lang/sl/lang.php @@ -7,7 +7,6 @@ * @author Gregor Skumavc (grega.skumavc@gmail.com) * @author Matej Urbančič (mateju@svn.gnome.org) */ - $lang['menu'] = 'Splošne nastavitve'; $lang['error'] = 'Nastavitve niso shranjene zaradi neveljavne vrednosti.<br />Neveljavna vrednost je označena z rdečim robom vnosnega polja.'; $lang['updated'] = 'Nastavitve so uspešno posodobljene.'; @@ -27,7 +26,7 @@ $lang['_authentication'] = 'Nastavitve overjanja'; $lang['_anti_spam'] = 'Nastavitve neželenih sporočil (Anti-Spam)'; $lang['_editing'] = 'Nastavitve urejanja'; $lang['_links'] = 'Nastavitve povezav'; -$lang['_media'] = 'Predstavnostne nastavitve'; +$lang['_media'] = 'Predstavne nastavitve'; $lang['_advanced'] = 'Napredne nastavitve'; $lang['_network'] = 'Omrežne nastavitve'; $lang['_plugin_sufix'] = 'nastavitve'; @@ -41,9 +40,12 @@ $lang['lang'] = 'Jezik vmesnika'; $lang['basedir'] = 'Pot do strežnika (npr. /dokuwiki/). Prazno polje določa samodejno zaznavanje'; $lang['baseurl'] = 'Naslov URL strežnika (npr. http://www.streznik.si). Prazno polje določa samodejno zaznavanje'; $lang['savedir'] = 'Mapa za shranjevanje podatkov'; +$lang['cookiedir'] = 'Pot do piškotka. Prazno polje določa uporabo osnovnega naslova (baseurl)'; $lang['start'] = 'Ime začetne strani wiki'; $lang['title'] = 'Naslov Wiki spletišča'; $lang['template'] = 'Predloga'; +$lang['tagline'] = 'Označna vrstica (ob podpori predloge)'; +$lang['sidebar'] = 'Ime strani stranske vrstice (ob podpori predloge); prazno polje onemogoči stransko vrstico.'; $lang['license'] = 'Pod pogoji katerega dovoljenja je objavljena vsebina?'; $lang['fullpath'] = 'Pokaži polno pot strani v nogi strani'; $lang['recent'] = 'Nedavne spremembe'; @@ -62,8 +64,9 @@ $lang['camelcase'] = 'Uporabi EnoBesedni zapisa za povezave'; $lang['deaccent'] = 'Počisti imena strani'; $lang['useheading'] = 'Uporabi prvi naslov za ime strani'; $lang['refcheck'] = 'Preverjanje sklica predstavnih datotek'; -$lang['refshow'] = 'Število predstavnostnih sklicev za prikaz'; +$lang['refshow'] = 'Število predstavih sklicev za prikaz'; $lang['allowdebug'] = 'Dovoli razhroščevanje (po potrebi!)'; +$lang['mediarevisions'] = 'Ali naj se omogočijo objave predstavnih vsebin?'; $lang['usewordblock'] = 'Zaustavi neželeno besedilo glede na seznam besed'; $lang['indexdelay'] = 'Časovni zamik pred ustvarjanjem kazala (v sekundah)'; $lang['relnofollow'] = 'Uporabni možnost rel="nofollow" pri zunanjih povezavah'; @@ -103,6 +106,7 @@ $lang['fetchsize'] = 'največja dovoljena velikost zunanjega prejema $lang['notify'] = 'Pošlji obvestila o spremembah na določen elektronski naslov'; $lang['registernotify'] = 'Pošlji obvestila o novih vpisanih uporabnikih na določen elektronski naslov'; $lang['mailfrom'] = 'Elektronski naslov za samodejno poslana sporočila'; +$lang['mailprefix'] = 'Predpona zadeve elektronskega sporočila za samodejna sporočila.'; $lang['gzip_output'] = 'Uporabi stiskanje gzip vsebine za xhtml'; $lang['gdlib'] = 'Različica GD Lib'; $lang['im_convert'] = 'Pot do orodja za pretvarjanje slik ImageMagick'; @@ -110,6 +114,7 @@ $lang['jpg_quality'] = 'Kakovost stiskanja datotek JPG (0-100)'; $lang['subscribers'] = 'Omogoči podporo naročanju na strani'; $lang['subscribe_time'] = 'Čas po katerem so poslani povzetki sprememb (v sekundah); Vrednost mora biti krajša od časa, ki je določen z nedavno_dni.'; $lang['compress'] = 'Združi odvod CSS in JavaScript v brskalniku'; +$lang['cssdatauri'] = 'Velikost sklicanih slik v bajtih, ki so navedene v datotekah CSS za zmanjšanje zahtev osveževanja strežnika HTTP. Ta možnost ni podprta v brskalniku MS IE 7 in nižjih različicah! Ustrezne vrednosti so <code>400</code> do <code>600</code> bajtov. Vrednost <code>0</code> onemogoči možnost.'; $lang['hidepages'] = 'Skrij skladne strani (logični izraz)'; $lang['send404'] = 'Pošlji "HTTP 404/Strani ni mogoče najti" pri dostopu do neobstoječih strani'; $lang['sitemap'] = 'Ustvari Google kazalo strani (v dnevih)'; @@ -172,9 +177,9 @@ $lang['compression_o_0'] = 'brez'; $lang['compression_o_gz'] = 'gzip'; $lang['compression_o_bz2'] = 'bz2'; $lang['xsendfile_o_0'] = 'ne uporabi'; -$lang['xsendfile_o_1'] = 'plačniška glava lighttpd (pred različico 1.5)'; +$lang['xsendfile_o_1'] = 'lastniška glava lighttpd (pred različico 1.5)'; $lang['xsendfile_o_2'] = 'običajna glava X-Sendfile'; -$lang['xsendfile_o_3'] = 'plačniška glava Nginx X-Accel-Redirect'; +$lang['xsendfile_o_3'] = 'lastniška glava Nginx X-Accel-Redirect'; $lang['showuseras_o_loginname'] = 'Prijavno ime'; $lang['showuseras_o_username'] = 'Polno ime uporabnika'; $lang['showuseras_o_email'] = 'Elektronski naslov uporabnika (šifriran po določilih varovanja)'; diff --git a/lib/plugins/plugin/lang/sl/admin_plugin.txt b/lib/plugins/plugin/lang/sl/admin_plugin.txt index 2e99c6297..5fd02e1ba 100644 --- a/lib/plugins/plugin/lang/sl/admin_plugin.txt +++ b/lib/plugins/plugin/lang/sl/admin_plugin.txt @@ -1,3 +1,3 @@ ====== Upravljanje vstavkov ====== -Na tej strani je mogoe spreminjati in prilagajati nastavitve Dokuwiki [[doku>plugins|vstavkov]]. Za prejemanje in nameanje vstavkov v ustrezne mape, morajo imeti te doloena ustrezna dovoljenja za pisanje spletnega strenika. +Na tej strani je mogoče spreminjati in prilagajati nastavitve DokuWiki [[doku>plugins|vstavkov]]. Za prejemanje in nameščanje vstavkov v ustrezne mape, morajo imeti te določena ustrezna dovoljenja za pisanje spletnega strežnika. diff --git a/lib/plugins/plugin/lang/sl/lang.php b/lib/plugins/plugin/lang/sl/lang.php index 39ba20139..3e5f8c8af 100644 --- a/lib/plugins/plugin/lang/sl/lang.php +++ b/lib/plugins/plugin/lang/sl/lang.php @@ -7,7 +7,6 @@ * @author Gregor Skumavc (grega.skumavc@gmail.com) * @author Matej Urbančič (mateju@svn.gnome.org) */ - $lang['menu'] = 'Upravljanje vstavkov'; $lang['download'] = 'Prejmi in namesti nov vstavek'; $lang['manage'] = 'Nameščeni vstavki'; @@ -52,3 +51,4 @@ $lang['enabled'] = 'Vstavek %s je omogočen.'; $lang['notenabled'] = 'Vstavka %s ni mogoče omogočiti zaradi neustreznih dovoljen.'; $lang['disabled'] = 'Vstavek %s je onemogočen.'; $lang['notdisabled'] = 'Vstavka %s ni mogoče onemogočiti zaradi neustreznih dovoljen.'; +$lang['packageinstalled'] = 'Paket vstavka (%d vstavkov: %s) je uspešno nameščen.'; diff --git a/lib/plugins/popularity/lang/sl/intro.txt b/lib/plugins/popularity/lang/sl/intro.txt index ceb0e61e6..2c029db63 100644 --- a/lib/plugins/popularity/lang/sl/intro.txt +++ b/lib/plugins/popularity/lang/sl/intro.txt @@ -1,9 +1,9 @@ -====== Poroilo o uporabi ====== +====== Poročilo o uporabi ====== -To orodje je namenjeno zbiranju brezimnih podatkov o postavljeni Dokuwiki strani in omogoa poiljanje nekaterih podatkov neposredno razvijalcem sistema. S temi podatki lahko razvijalci razumejo naine uporabe sistema, zahteve uporabnikov in pogostost uporabe, kar s statistinimi podatki vpliva tudi na nadaljnji razvoj sistema. +To orodje je namenjeno zbiranju brezimnih podatkov o postavljeni DokuWiki strani in omogoča pošiljanje nekaterih podatkov neposredno razvijalcem sistema. S temi podatki lahko razvijalci razumejo načine uporabe sistema, zahteve uporabnikov in pogostost uporabe, kar s statističnimi podatki vpliva tudi na nadaljnji razvoj sistema. -Priporoeno je, da poroilo o uporabi poljete vsake toliko asa, saj lahko le tako razvijalci dobijo podatke o hitrosti rasti spletia in pogostosti uporabe. Vsi podatki so poslani oznaeni s posebno vpisno tevilko, ki omogoa brezimno sledenje. +Priporočeno je, da poročilo o uporabi pošljete vsake toliko časa, saj lahko le tako razvijalci dobijo podatke o hitrosti rasti spletišča in pogostosti uporabe. Vsi podatki so poslani označeni s posebno vpisno številko, ki omogoča brezimno sledenje. -Zbrani podatki vsebujejo podrobnosti o razliici uporabljenega sistema DokuWiki, tevilo in velikost wiki strani, datotekah, ki so naloene na sistem in podatke o vstavkih ter PHP namestitvi in razliici. +Zbrani podatki vsebujejo podrobnosti o različici uporabljenega sistema DokuWiki, število in velikost wiki strani, datotekah, ki so naložene na sistem in podatke o vstavkih ter PHP namestitvi in različici. -Surovi podatki, ki bodo poslani so prikazani spodaj. S pritiskom na gumb "Polji podatke", bodo ti poslani na strenik razvijalcev. +Surovi podatki, ki bodo poslani so prikazani spodaj. S pritiskom na gumb "Pošlji podatke", bodo ti poslani na strežnik razvijalcev. diff --git a/lib/plugins/popularity/lang/sl/submitted.txt b/lib/plugins/popularity/lang/sl/submitted.txt index 988afd837..11ae052f7 100644 --- a/lib/plugins/popularity/lang/sl/submitted.txt +++ b/lib/plugins/popularity/lang/sl/submitted.txt @@ -1,3 +1,3 @@ -====== Poroilo o uporabi ====== +====== Poročilo o uporabi ====== -Podatki so bili uspeno poslani. +Podatki so bili uspešno poslani. diff --git a/lib/plugins/revert/lang/sl/intro.txt b/lib/plugins/revert/lang/sl/intro.txt index c63f281ed..4e2cabf96 100644 --- a/lib/plugins/revert/lang/sl/intro.txt +++ b/lib/plugins/revert/lang/sl/intro.txt @@ -1,3 +1,3 @@ ====== Povrnitev okvarjene vsebine ====== -Na tej strani je mogoe povrniti vsebino wiki strani na izvorne vrednosti po napadu na stran in vpisu neelenih vsebin. Za iskanje strani z neeleno vsebino, uporabite iskalnik z ustreznim nizom (npr. naslov URL), potem pa potrdite, da so najdene strani res z neeleno vsebino in nato povrnite stanje na zadnjo pravo razliico. +Na tej strani je mogoče povrniti vsebino wiki strani na izvorne vrednosti po napadu na stran in vpisu neželenih vsebin. Za iskanje strani z neželeno vsebino, uporabite iskalnik z ustreznim nizom (npr. naslov URL), potem pa potrdite, da so najdene strani res z neželeno vsebino in nato povrnite stanje na zadnjo pravo različico. diff --git a/lib/plugins/usermanager/lang/sl/delete.txt b/lib/plugins/usermanager/lang/sl/delete.txt index 7d9de54e6..1fd4fffe1 100644 --- a/lib/plugins/usermanager/lang/sl/delete.txt +++ b/lib/plugins/usermanager/lang/sl/delete.txt @@ -1 +1 @@ -===== Izbrisanje uporabnika ===== \ No newline at end of file +===== Izbris uporabnika ===== \ No newline at end of file -- cgit v1.2.3 From a4878cbbdfbbaecb901047f6afb85ea24a5eeb58 Mon Sep 17 00:00:00 2001 From: Anika Henke <anika@selfthinker.org> Date: Thu, 2 Feb 2012 23:53:54 +0000 Subject: improved minor edits in recent changes --- css/_recent.css | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/css/_recent.css b/css/_recent.css index 0e3745cbd..68f0e5826 100755 --- a/css/_recent.css +++ b/css/_recent.css @@ -28,8 +28,7 @@ } .dokuwiki #dw__recent ul li.minor, .dokuwiki #page__revisions ul li.minor { - color: __text_alt__; - background-color: inherit; + opacity: .7; } .dokuwiki #dw__recent li span.date, -- cgit v1.2.3 From c7b28ffda48d3e6e225940a74b00ee5011f45b4b Mon Sep 17 00:00:00 2001 From: Anika Henke <anika@selfthinker.org> Date: Sat, 4 Feb 2012 13:26:50 +0000 Subject: added div.table around non-editable content as well (FS#1980) --- inc/html.php | 2 ++ inc/media.php | 2 ++ lib/plugins/acl/admin.php | 2 ++ lib/plugins/config/admin.php | 4 ++++ lib/plugins/info/syntax.php | 8 ++++---- lib/plugins/usermanager/admin.php | 4 ++++ 6 files changed, 18 insertions(+), 4 deletions(-) diff --git a/inc/html.php b/inc/html.php index 1a2d7daef..ece26d136 100644 --- a/inc/html.php +++ b/inc/html.php @@ -1176,6 +1176,7 @@ function html_diff($text='',$intro=true,$type=null){ ptln('</div>'); } ?> + <div class="table"> <table class="diff diff_<?php echo $type?>"> <tr> <th colspan="2" <?php echo $l_minor?>> @@ -1187,6 +1188,7 @@ function html_diff($text='',$intro=true,$type=null){ </tr> <?php echo $tdf->format($df)?> </table> + </div> <?php } diff --git a/inc/media.php b/inc/media.php index c53e1f5fc..66c531452 100644 --- a/inc/media.php +++ b/inc/media.php @@ -1116,6 +1116,7 @@ function media_file_diff($image, $l_rev, $r_rev, $ns, $auth, $fromajax){ list($l_head, $r_head) = html_diff_head($l_rev, $r_rev, $image, true); ?> + <div class="table"> <table> <tr> <th><?php echo $l_head; ?></th> @@ -1183,6 +1184,7 @@ function media_file_diff($image, $l_rev, $r_rev, $ns, $auth, $fromajax){ echo '</tr>'.NL; echo '</table>'.NL; + echo '</div>'.NL; if ($is_img && !$fromajax) echo '</div>'; } diff --git a/lib/plugins/acl/admin.php b/lib/plugins/acl/admin.php index a6b0624bc..c3461b78b 100644 --- a/lib/plugins/acl/admin.php +++ b/lib/plugins/acl/admin.php @@ -597,6 +597,7 @@ class admin_plugin_acl extends DokuWiki_Admin_Plugin { echo '<input type="hidden" name="do" value="admin" />'.NL; echo '<input type="hidden" name="page" value="acl" />'.NL; echo '<input type="hidden" name="sectok" value="'.getSecurityToken().'" />'.NL; + echo '<div class="table">'; echo '<table class="inline">'; echo '<tr>'; echo '<th>'.$this->getLang('where').'</th>'; @@ -642,6 +643,7 @@ class admin_plugin_acl extends DokuWiki_Admin_Plugin { echo '</th>'; echo '</tr>'; echo '</table>'; + echo '</div>'; echo '</div></form>'.NL; } diff --git a/lib/plugins/config/admin.php b/lib/plugins/config/admin.php index c883e7b6a..9a9bb5329 100644 --- a/lib/plugins/config/admin.php +++ b/lib/plugins/config/admin.php @@ -131,6 +131,7 @@ class admin_plugin_config extends DokuWiki_Admin_Plugin { } ptln(' <fieldset id="'.$setting->_key.'">'); ptln(' <legend>'.$setting->prompt($this).'</legend>'); + ptln(' <div class="table">'); ptln(' <table class="inline">'); } else { // config settings @@ -151,6 +152,7 @@ class admin_plugin_config extends DokuWiki_Admin_Plugin { } ptln(' </table>'); + ptln(' </div>'); if ($in_fieldset) { ptln(' </fieldset>'); } @@ -161,6 +163,7 @@ class admin_plugin_config extends DokuWiki_Admin_Plugin { usort($undefined_settings, '_setting_natural_comparison'); $this->_print_h1('undefined_settings', $this->getLang('_header_undefined')); ptln('<fieldset>'); + ptln('<div class="table">'); ptln('<table class="inline">'); $undefined_setting_match = array(); foreach($undefined_settings as $setting) { @@ -175,6 +178,7 @@ class admin_plugin_config extends DokuWiki_Admin_Plugin { ptln(' </tr>'); } ptln('</table>'); + ptln('</div>'); ptln('</fieldset>'); } diff --git a/lib/plugins/info/syntax.php b/lib/plugins/info/syntax.php index 026a438bb..9aedbf0aa 100644 --- a/lib/plugins/info/syntax.php +++ b/lib/plugins/info/syntax.php @@ -174,7 +174,7 @@ class syntax_plugin_info extends DokuWiki_Syntax_Plugin { $hid = $this->_addToTOC($title, 3, $renderer); $doc .= '<h3><a name="'.$hid.'" id="'.$hid.'">'.hsc($title).'</a></h3>'; $doc .= '<div class="level3">'; - $doc .= '<table class="inline"><tbody>'; + $doc .= '<div class="table"><table class="inline"><tbody>'; $doc .= '<tr><th>Description</th><td colspan="2">'.$method['desc']. '</td></tr>'; if ($method['params']){ @@ -190,7 +190,7 @@ class syntax_plugin_info extends DokuWiki_Syntax_Plugin { $doc .= '<tr><th>Return value</th><td>'.hsc(key($method['return'])). '</td><td>'.hsc(current($method['return'])).'</td></tr>'; } - $doc .= '</tbody></table>'; + $doc .= '</tbody></table></div>'; $doc .= '</div>'; } unset($po); @@ -206,7 +206,7 @@ class syntax_plugin_info extends DokuWiki_Syntax_Plugin { global $PARSER_MODES; $doc = ''; - $doc .= '<table class="inline"><tbody>'; + $doc .= '<div class="table"><table class="inline"><tbody>'; foreach($PARSER_MODES as $mode => $modes){ $doc .= '<tr>'; $doc .= '<td class="leftalign">'; @@ -217,7 +217,7 @@ class syntax_plugin_info extends DokuWiki_Syntax_Plugin { $doc .= '</td>'; $doc .= '</tr>'; } - $doc .= '</tbody></table>'; + $doc .= '</tbody></table></div>'; return $doc; } diff --git a/lib/plugins/usermanager/admin.php b/lib/plugins/usermanager/admin.php index 8e90be093..8b646b426 100644 --- a/lib/plugins/usermanager/admin.php +++ b/lib/plugins/usermanager/admin.php @@ -149,6 +149,7 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin { } ptln("<form action=\"".wl($ID)."\" method=\"post\">"); formSecurityToken(); + ptln(" <div class=\"table\">"); ptln(" <table class=\"inline\">"); ptln(" <thead>"); ptln(" <tr>"); @@ -206,6 +207,7 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin { ptln(" </td></tr>"); ptln(" </tbody>"); ptln(" </table>"); + ptln(" </div>"); ptln("</form>"); ptln("</div>"); @@ -256,6 +258,7 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin { ptln("<form action=\"".wl($ID)."\" method=\"post\">",$indent); formSecurityToken(); + ptln(" <div class=\"table\">",$indent); ptln(" <table class=\"inline\">",$indent); ptln(" <thead>",$indent); ptln(" <tr><th>".$this->lang["field"]."</th><th>".$this->lang["value"]."</th></tr>",$indent); @@ -295,6 +298,7 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin { ptln(" </tr>",$indent); ptln(" </tbody>",$indent); ptln(" </table>",$indent); + ptln(" </div>",$indent); foreach ($notes as $note) ptln("<div class=\"fn\">".$note."</div>",$indent); -- cgit v1.2.3 From 2d74814f032eb77d6ed604f6328edfc229446c3b Mon Sep 17 00:00:00 2001 From: Dominik Eckelmann <deckelmann@gmail.com> Date: Sun, 5 Feb 2012 12:30:02 +0100 Subject: added getapi methods to remote plugin --- lib/plugins/remote.php | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/lib/plugins/remote.php b/lib/plugins/remote.php index 42c2f53c8..a51f701fb 100644 --- a/lib/plugins/remote.php +++ b/lib/plugins/remote.php @@ -2,10 +2,20 @@ abstract class DokuWiki_Remote_Plugin extends DokuWiki_Plugin { + private $api; + + public function __construct() { + $this->api = new RemoteAPI(); + } + /** * @abstract * @return array Information to all provided methods. {@see RemoteAPI}. */ public abstract function _getMethods(); + protected function getApi() { + return $this->api; + } + } -- cgit v1.2.3 From 750a55de568a82aaa40ca384a17a64804e94f2b9 Mon Sep 17 00:00:00 2001 From: Dominik Eckelmann <deckelmann@gmail.com> Date: Sun, 5 Feb 2012 12:33:35 +0100 Subject: corrected comment --- inc/remote.php | 3 ++- lib/exe/xmlrpc.php | 1 - 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/inc/remote.php b/inc/remote.php index 0a507e95d..82a0d3c08 100644 --- a/inc/remote.php +++ b/inc/remote.php @@ -23,7 +23,8 @@ class RemoteAccessDeniedException extends RemoteException {} * ) * 'name' => 'method name in class', * 'return' => 'type', -* ['doc' = 'method documentation'], + * 'public' => 1/0 - method bypass default group check (used by login) + * ['doc' = 'method documentation'], * ) * ) * diff --git a/lib/exe/xmlrpc.php b/lib/exe/xmlrpc.php index ce9ef1484..a48ac41b0 100644 --- a/lib/exe/xmlrpc.php +++ b/lib/exe/xmlrpc.php @@ -34,7 +34,6 @@ class dokuwiki_xmlrpc_server extends IXR_Server { function call($methodname, $args){ try { - //print 'a'; $result = $this->remote->call($methodname, $args); return $result; } catch (RemoteAccessDeniedException $e) { -- cgit v1.2.3 From 03d7247e047c21d2733f837148a1499f56784ae3 Mon Sep 17 00:00:00 2001 From: Dominik Eckelmann <deckelmann@gmail.com> Date: Sun, 5 Feb 2012 12:36:19 +0100 Subject: moved plugin and core method calls to seperate function --- inc/remote.php | 38 +++++++++++++++++++++++--------------- 1 file changed, 23 insertions(+), 15 deletions(-) diff --git a/inc/remote.php b/inc/remote.php index 82a0d3c08..105969f8b 100644 --- a/inc/remote.php +++ b/inc/remote.php @@ -82,23 +82,31 @@ class RemoteAPI { } list($type, $pluginName, $call) = explode('.', $method, 3); if ($type === 'plugin') { - $plugin = plugin_load('remote', $pluginName); - $methods = $this->getPluginMethods(); - if (!$plugin) { - throw new RemoteException('Method dose not exists'); - } - $this->checkAccess($methods[$method]); - $name = $this->getMethodName($methods, $method); - return call_user_func_array(array($plugin, $name), $args); + return $this->callPlugin($pluginName, $method, $args); } else { - $coreMethods = $this->getCoreMethods(); - $this->checkAccess($coreMethods[$method]); - if (!isset($coreMethods[$method])) { - throw new RemoteException('Method dose not exists'); - } - $this->checkArgumentLength($coreMethods[$method], $args); - return call_user_func_array(array($this->coreMethods, $this->getMethodName($coreMethods, $method)), $args); + return $this->callCoreMethod($method, $args); + } + } + + private function callPlugin($pluginName, $method, $args) { + $plugin = plugin_load('remote', $pluginName); + $methods = $this->getPluginMethods(); + if (!$plugin) { + throw new RemoteException('Method dose not exists'); + } + $this->checkAccess($methods[$method]); + $name = $this->getMethodName($methods, $method); + return call_user_func_array(array($plugin, $name), $args); + } + + private function callCoreMethod($method, $args) { + $coreMethods = $this->getCoreMethods(); + $this->checkAccess($coreMethods[$method]); + if (!isset($coreMethods[$method])) { + throw new RemoteException('Method dose not exists'); } + $this->checkArgumentLength($coreMethods[$method], $args); + return call_user_func_array(array($this->coreMethods, $this->getMethodName($coreMethods, $method)), $args); } private function checkAccess($methodMeta) { -- cgit v1.2.3 From a8a8136cc9909b1b0df4008e1791deaa5ee5891f Mon Sep 17 00:00:00 2001 From: Anika Henke <anika@selfthinker.org> Date: Sun, 5 Feb 2012 12:12:34 +0000 Subject: minor improvements --- css/content.css | 2 +- css/design.css | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/css/content.css b/css/content.css index 18fda7ea8..4e9f8cbe1 100755 --- a/css/content.css +++ b/css/content.css @@ -62,7 +62,7 @@ overflow-x: auto; margin-bottom: 1.4em; } -.dokuwiki div.table table.inline { +.dokuwiki div.table table { margin-bottom: 0; } diff --git a/css/design.css b/css/design.css index 19821d401..39d793f99 100755 --- a/css/design.css +++ b/css/design.css @@ -382,6 +382,9 @@ .dokuwiki #toc__inside ul li { list-style-image: url(images/toc-bullet.png); } +.dokuwiki #toc__inside ul li.clear { + list-style: none; +} .dokuwiki #toc__inside ul li div.li { padding: .2em 0; } -- cgit v1.2.3 From 79b3df949fb269d4c1e78a382efc163d514e2434 Mon Sep 17 00:00:00 2001 From: Anika Henke <anika@selfthinker.org> Date: Sun, 5 Feb 2012 13:12:21 +0000 Subject: added styles for screen resolutions between 480 and 768px (#26) --- css/mobile.css | 96 +++++++++++++++++++++++++++++++++++++--------------------- 1 file changed, 62 insertions(+), 34 deletions(-) diff --git a/css/mobile.css b/css/mobile.css index cbadc70fd..38242f5be 100644 --- a/css/mobile.css +++ b/css/mobile.css @@ -1,30 +1,21 @@ /** * This file provides styles for mobile devices - * and smaller screens (up to 480px width). + * and smaller screens (up to 480px and 768px width). * * @author Anika Henke <anika@selfthinker.org> */ -@media only screen and (max-width: 480px), only screen and (max-device-width: 960px) { - -/*____________ structure ____________*/ - -#dokuwiki__site { - max-width: 100%; -} -#dokuwiki__site .site { - padding: 0 .5em; -} -#dokuwiki__header { - padding: .5em 0; -} +/* up to 768px screen widths +********************************************************************/ +@media only screen and (max-width: 768px), only screen and (max-device-width: 960px) { +/* structure */ #dokuwiki__aside { width: 100%; float: none; } #dokuwiki__aside .pad { - margin: 0; + margin: 0 0 .5em; } .hasSidebar #dokuwiki__content { @@ -36,6 +27,62 @@ margin-left: 0; } +/* toc */ +.dokuwiki div.toc { + float: none; + margin: 0 0 1em 0; + width: auto; + border-left-width: 0; + border-bottom: 1px solid __border__; +} +.dokuwiki div.tocheader { + padding: 0 0 .5em; +} +.dokuwiki #toc__inside { + padding: .2em 0 .5em; +} + +/* page */ +.dokuwiki div.page { + padding: 1em; +} +.dokuwiki .pageId span { + border-width: 0; + background-color: __background_site__; + color: __text_alt__; + box-shadow: 0 0 0; +} + +/* _edit */ +.dokuwiki div.section_highlight { + margin: -3em -1em -.01em -1em; + padding: 3em .5em .01em .5em; + border-width: 0 .5em; +} +.dokuwiki div.preview { + margin: 0 -1em; + padding: 1em; +} + + +} /* /@media */ + + +/* up to 480px screen widths +********************************************************************/ +@media only screen and (max-width: 480px), only screen and (max-device-width: 960px) { + +/*____________ structure ____________*/ + +#dokuwiki__site { + max-width: 100%; +} +#dokuwiki__site .site { + padding: 0 .5em; +} +#dokuwiki__header { + padding: .5em 0; +} /*____________ header ____________*/ @@ -107,25 +154,6 @@ padding: .5em; } -h1 { - margin-top: 0; -} - -/* toc */ -.dokuwiki div.toc { - float: none; - margin: 0 0 1em 0; - width: auto; - border-left-width: 0; - border-bottom: 1px solid __border__; -} -.dokuwiki div.tocheader { - padding: 0 0 .5em; -} -.dokuwiki #toc__inside { - padding: .2em 0 .5em; -} - /* form elements */ #config__manager fieldset td.value, #config__manager td .input, -- cgit v1.2.3 From 0afd685c36d348dedfca731c55f562668f7e094b Mon Sep 17 00:00:00 2001 From: Anika Henke <anika@selfthinker.org> Date: Sun, 5 Feb 2012 15:18:19 +0000 Subject: deleted obsolete files --- conf/default.php | 11 ----------- conf/metadata.php | 11 ----------- lang/af/lang.php | 12 ------------ lang/ar/lang.php | 13 ------------- lang/az/lang.php | 12 ------------ lang/bg/lang.php | 12 ------------ lang/ca/lang.php | 13 ------------- lang/cs/lang.php | 12 ------------ lang/da/lang.php | 13 ------------- lang/de/lang.php | 18 ------------------ lang/el/lang.php | 12 ------------ lang/en/lang.php | 15 --------------- lang/en/settings.php | 11 ----------- lang/eo/lang.php | 11 ----------- lang/es/lang.php | 12 ------------ lang/et/lang.php | 13 ------------- lang/eu/lang.php | 12 ------------ lang/fa/lang.php | 12 ------------ lang/fi/lang.php | 13 ------------- lang/fo/lang.php | 11 ----------- lang/fr/lang.php | 12 ------------ lang/gl/lang.php | 12 ------------ lang/he/lang.php | 12 ------------ lang/hi/lang.php | 12 ------------ lang/hr/lang.php | 12 ------------ lang/hu/lang.php | 12 ------------ lang/ia/lang.php | 11 ----------- lang/id/lang.php | 12 ------------ lang/is/lang.php | 12 ------------ lang/it/lang.php | 12 ------------ lang/ja/lang.php | 12 ------------ lang/km/lang.php | 11 ----------- lang/ko/lang.php | 12 ------------ lang/la/lang.php | 11 ----------- lang/lb/lang.php | 11 ----------- lang/lt/lang.php | 12 ------------ lang/lv/lang.php | 12 ------------ lang/mg/lang.php | 11 ----------- lang/mk/lang.php | 12 ------------ lang/mr/lang.php | 11 ----------- lang/ne/lang.php | 11 ----------- lang/nl/lang.php | 12 ------------ lang/no/lang.php | 12 ------------ lang/pl/lang.php | 12 ------------ lang/pt-br/lang.php | 12 ------------ lang/pt/lang.php | 12 ------------ lang/ro/lang.php | 12 ------------ lang/ru/lang.php | 12 ------------ lang/sk/lang.php | 12 ------------ lang/sl/lang.php | 12 ------------ lang/sq/lang.php | 12 ------------ lang/sr/lang.php | 8 -------- lang/sv/lang.php | 12 ------------ lang/th/lang.php | 12 ------------ lang/tr/lang.php | 12 ------------ lang/uk/lang.php | 12 ------------ lang/vi/lang.php | 12 ------------ lang/zh-tw/lang.php | 12 ------------ lang/zh/lang.php | 12 ------------ 59 files changed, 706 deletions(-) delete mode 100644 conf/default.php delete mode 100644 conf/metadata.php delete mode 100644 lang/af/lang.php delete mode 100644 lang/ar/lang.php delete mode 100644 lang/az/lang.php delete mode 100644 lang/bg/lang.php delete mode 100644 lang/ca/lang.php delete mode 100644 lang/cs/lang.php delete mode 100644 lang/da/lang.php delete mode 100644 lang/de/lang.php delete mode 100644 lang/el/lang.php delete mode 100644 lang/en/lang.php delete mode 100644 lang/en/settings.php delete mode 100644 lang/eo/lang.php delete mode 100644 lang/es/lang.php delete mode 100644 lang/et/lang.php delete mode 100644 lang/eu/lang.php delete mode 100644 lang/fa/lang.php delete mode 100644 lang/fi/lang.php delete mode 100644 lang/fo/lang.php delete mode 100644 lang/fr/lang.php delete mode 100644 lang/gl/lang.php delete mode 100644 lang/he/lang.php delete mode 100644 lang/hi/lang.php delete mode 100644 lang/hr/lang.php delete mode 100644 lang/hu/lang.php delete mode 100644 lang/ia/lang.php delete mode 100644 lang/id/lang.php delete mode 100644 lang/is/lang.php delete mode 100644 lang/it/lang.php delete mode 100644 lang/ja/lang.php delete mode 100644 lang/km/lang.php delete mode 100644 lang/ko/lang.php delete mode 100644 lang/la/lang.php delete mode 100644 lang/lb/lang.php delete mode 100644 lang/lt/lang.php delete mode 100644 lang/lv/lang.php delete mode 100644 lang/mg/lang.php delete mode 100644 lang/mk/lang.php delete mode 100644 lang/mr/lang.php delete mode 100644 lang/ne/lang.php delete mode 100644 lang/nl/lang.php delete mode 100644 lang/no/lang.php delete mode 100644 lang/pl/lang.php delete mode 100644 lang/pt-br/lang.php delete mode 100644 lang/pt/lang.php delete mode 100644 lang/ro/lang.php delete mode 100644 lang/ru/lang.php delete mode 100644 lang/sk/lang.php delete mode 100644 lang/sl/lang.php delete mode 100644 lang/sq/lang.php delete mode 100644 lang/sr/lang.php delete mode 100644 lang/sv/lang.php delete mode 100644 lang/th/lang.php delete mode 100644 lang/tr/lang.php delete mode 100644 lang/uk/lang.php delete mode 100644 lang/vi/lang.php delete mode 100644 lang/zh-tw/lang.php delete mode 100644 lang/zh/lang.php diff --git a/conf/default.php b/conf/default.php deleted file mode 100644 index 57b7bd581..000000000 --- a/conf/default.php +++ /dev/null @@ -1,11 +0,0 @@ -<?php -/* - * default configuration settings - * - */ - -$conf['tagline'] = 'This is the tagline - explaining what this site is about.'; -$conf['discussionPage'] = 'discussion:@ID@'; -$conf['userPage'] = 'user:@USER@:'; -$conf['sidebarID'] = 'sidebar'; -$conf['hideTools'] = 0; diff --git a/conf/metadata.php b/conf/metadata.php deleted file mode 100644 index 88583bcd0..000000000 --- a/conf/metadata.php +++ /dev/null @@ -1,11 +0,0 @@ -<?php -/* - * configuration metadata - * - */ - -$meta['tagline'] = array('string'); -$meta['discussionPage'] = array('string'); -$meta['userPage'] = array('string'); -$meta['sidebarID'] = array('string'); -$meta['hideTools'] = array('onoff'); diff --git a/lang/af/lang.php b/lang/af/lang.php deleted file mode 100644 index 127ac3076..000000000 --- a/lang/af/lang.php +++ /dev/null @@ -1,12 +0,0 @@ -<?php -/** - * Afrikaans language file - * - * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - */ - -$lang['discussion'] = 'Bespreking'; -$lang['back_to_article'] = 'Terug na die artikel'; -$lang['userpage'] = 'Gebruikersbladsy'; - -//Setup VIM: ex: et ts=2 : diff --git a/lang/ar/lang.php b/lang/ar/lang.php deleted file mode 100644 index d5c10bb1c..000000000 --- a/lang/ar/lang.php +++ /dev/null @@ -1,13 +0,0 @@ -<?php -/** - * Arabic language file - * - * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - */ - -$lang['discussion'] = 'نقاش'; -$lang['back_to_article'] = 'عودة إلى المقالة'; -//العودة إلى المقال -$lang['userpage'] = 'صفحة مستخدم'; - -//Setup VIM: ex: et ts=2 : diff --git a/lang/az/lang.php b/lang/az/lang.php deleted file mode 100644 index ea94e8706..000000000 --- a/lang/az/lang.php +++ /dev/null @@ -1,12 +0,0 @@ -<?php -/** - * Azerbaijani language file - * - * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - */ - -$lang['discussion'] = 'Müzakirə'; -$lang['back_to_article'] = 'Geri makalenin'; // Məqalədə qayıt -$lang['userpage'] = 'İstifadəçi səhifəsi'; - -//Setup VIM: ex: et ts=2 : diff --git a/lang/bg/lang.php b/lang/bg/lang.php deleted file mode 100644 index 039b07a1f..000000000 --- a/lang/bg/lang.php +++ /dev/null @@ -1,12 +0,0 @@ -<?php -/** - * Bulgarian language file - * - * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - */ - -$lang['discussion'] = 'Беседа'; -$lang['back_to_article'] = 'Обратно към статията'; -$lang['userpage'] = 'Потребител'; - -//Setup VIM: ex: et ts=2 : diff --git a/lang/ca/lang.php b/lang/ca/lang.php deleted file mode 100644 index 3ed0be76d..000000000 --- a/lang/ca/lang.php +++ /dev/null @@ -1,13 +0,0 @@ -<?php -/** - * Catalan language file - * - * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - */ - -$lang['discussion'] = 'Discussió'; -$lang['back_to_article'] = 'Tornar al article'; -$lang['userpage'] = "Pàgina d'usuari"; - - -//Setup VIM: ex: et ts=2 : diff --git a/lang/cs/lang.php b/lang/cs/lang.php deleted file mode 100644 index d4e0ef32a..000000000 --- a/lang/cs/lang.php +++ /dev/null @@ -1,12 +0,0 @@ -<?php -/** - * Czech language file - * - * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - */ - -$lang['discussion'] = 'Diskuse'; -$lang['back_to_article'] = 'Zpet na clánek'; -$lang['userpage'] = 'Uživatelova stránka'; - -//Setup VIM: ex: et ts=2 : diff --git a/lang/da/lang.php b/lang/da/lang.php deleted file mode 100644 index 1837ab5dd..000000000 --- a/lang/da/lang.php +++ /dev/null @@ -1,13 +0,0 @@ -<?php -/** - * Danish language file - * - * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - */ - -$lang['discussion'] = 'Diskussion'; -$lang['back_to_article'] = 'Tilbage til artiklen'; -$lang['userpage'] = 'Brugerside'; - -//Setup VIM: ex: et ts=2 : - diff --git a/lang/de/lang.php b/lang/de/lang.php deleted file mode 100644 index 808d9e247..000000000 --- a/lang/de/lang.php +++ /dev/null @@ -1,18 +0,0 @@ -<?php -/** - * German language file - * - * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - */ - -$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/el/lang.php b/lang/el/lang.php deleted file mode 100644 index 135e0a10f..000000000 --- a/lang/el/lang.php +++ /dev/null @@ -1,12 +0,0 @@ -<?php -/** - * Greek language file - * - * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - */ - -$lang['discussion'] = 'Συζήτηση'; -$lang['back_to_article'] = 'Πίσω στα άρθρα'; -$lang['userpage'] = 'Σελίδα χρήστη'; - -//Setup VIM: ex: et ts=2 : diff --git a/lang/en/lang.php b/lang/en/lang.php deleted file mode 100644 index 91b04b177..000000000 --- a/lang/en/lang.php +++ /dev/null @@ -1,15 +0,0 @@ -<?php -/** - * English language file for template - * - */ - -$lang['discussion'] = 'Discussion'; -$lang['back_to_article'] = 'Back to article'; -$lang['userpage'] = 'User page'; - -/* accessibility headlines */ -$lang['user_tools'] = 'User Tools'; -$lang['site_tools'] = 'Site Tools'; -$lang['page_tools'] = 'Page Tools'; -$lang['skip_to_content'] = 'skip to content'; diff --git a/lang/en/settings.php b/lang/en/settings.php deleted file mode 100644 index 356e95234..000000000 --- a/lang/en/settings.php +++ /dev/null @@ -1,11 +0,0 @@ -<?php -/** - * English language file for config - * - */ - -$lang['tagline'] = 'Tagline'; -$lang['discussionPage'] = 'Discussion page (leave empty to disable discussions)'; -$lang['userPage'] = 'User page (leave empty to disable user pages)'; -$lang['sidebarID'] = 'page name of page included in sidebar'; -$lang['hideTools'] = 'Hide tools when not logged in?'; diff --git a/lang/eo/lang.php b/lang/eo/lang.php deleted file mode 100644 index cc637392e..000000000 --- a/lang/eo/lang.php +++ /dev/null @@ -1,11 +0,0 @@ -<?php -/** - * Esperantiga dosiero - * - * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - */ - -$lang['discussion'] = 'Diskuto'; -$lang['userpage'] = 'Pago de uzanto'; - -//Setup VIM: ex: et ts=2 : diff --git a/lang/es/lang.php b/lang/es/lang.php deleted file mode 100644 index d949b3f90..000000000 --- a/lang/es/lang.php +++ /dev/null @@ -1,12 +0,0 @@ -<?php -/** - * Spanish language file - * - * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - */ - -$lang['discussion'] = 'Discusión'; -$lang['back_to_article'] = 'Volver al artículo'; -$lang['userpage'] = 'Página de usuario'; - -//Setup VIM: ex: et ts=2 : diff --git a/lang/et/lang.php b/lang/et/lang.php deleted file mode 100644 index f6223b752..000000000 --- a/lang/et/lang.php +++ /dev/null @@ -1,13 +0,0 @@ -<?php -/** - * Estonian language file - * - * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - */ - -$lang['discussion'] = 'Arutelu'; -$lang['back_to_article'] = 'Tagasi artikli'; -$lang['userpage'] = 'Kasutaja leht'; - - -//Setup VIM: ex: et ts=2 : diff --git a/lang/eu/lang.php b/lang/eu/lang.php deleted file mode 100644 index a71127072..000000000 --- a/lang/eu/lang.php +++ /dev/null @@ -1,12 +0,0 @@ -<?php -/** - * Basque language file - * - * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - */ - -$lang['discussion'] = 'Eztabaida'; -$lang['back_to_article'] = 'Bueltatu'; -$lang['userpage'] = 'Lankide orrialdea';//Erabiltzaile orrialdea - -//Setup VIM: ex: et ts=2 : diff --git a/lang/fa/lang.php b/lang/fa/lang.php deleted file mode 100644 index 23caa26b8..000000000 --- a/lang/fa/lang.php +++ /dev/null @@ -1,12 +0,0 @@ -<?php -/** - * Persian language file - * - * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - */ - -$lang['discussion'] = 'بحث'; -$lang['back_to_article'] = 'برگشت به مقاله'; -$lang['userpage'] = 'صفحهٔ کاربر'; - -//Setup VIM: ex: et ts=2 : diff --git a/lang/fi/lang.php b/lang/fi/lang.php deleted file mode 100644 index f64555b65..000000000 --- a/lang/fi/lang.php +++ /dev/null @@ -1,13 +0,0 @@ -<?php -/** - * Finnish language file - * - * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - */ - -$lang['discussion'] = 'Keskustelu'; -$lang['back_to_article'] = 'Takaisin artikkeliin'; -$lang['userpage'] = 'Käyttäjäsivu'; - - -//Setup VIM: ex: et ts=2 : diff --git a/lang/fo/lang.php b/lang/fo/lang.php deleted file mode 100644 index 4e3d7d2de..000000000 --- a/lang/fo/lang.php +++ /dev/null @@ -1,11 +0,0 @@ -<?php -/** - * Faroese language file - * - * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - */ - -$lang['discussion'] = 'Kjak'; -$lang['userpage'] = 'Brúkarasíða'; - -//Setup VIM: ex: et ts=2 : diff --git a/lang/fr/lang.php b/lang/fr/lang.php deleted file mode 100644 index fa01076b2..000000000 --- a/lang/fr/lang.php +++ /dev/null @@ -1,12 +0,0 @@ -<?php -/** - * French language file - * - * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - */ - -$lang['discussion'] = 'Discussion'; -$lang['back_to_article'] = "Retour à l'article"; -$lang['userpage'] = 'Page utilisateur'; - -//Setup VIM: ex: et ts=2 : diff --git a/lang/gl/lang.php b/lang/gl/lang.php deleted file mode 100644 index 4b8fbffe6..000000000 --- a/lang/gl/lang.php +++ /dev/null @@ -1,12 +0,0 @@ -<?php -/** - * Galician language file - * - * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - */ - -$lang['discussion'] = 'Conversa'; -$lang['back_to_article'] = 'Voltar ao artigo'; -$lang['userpage'] = 'Páxina de usuario'; - -//Setup VIM: ex: et ts=2 : diff --git a/lang/he/lang.php b/lang/he/lang.php deleted file mode 100644 index c6a7f55be..000000000 --- a/lang/he/lang.php +++ /dev/null @@ -1,12 +0,0 @@ -<?php -/** - * Hebrew language file - * - * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - */ - -$lang['discussion'] = 'שיחה'; -$lang['back_to_article'] = 'חזור אל המאמר'; -$lang['userpage'] = 'דף משתמש'; - -//Setup VIM: ex: et ts=2 : diff --git a/lang/hi/lang.php b/lang/hi/lang.php deleted file mode 100644 index 298395962..000000000 --- a/lang/hi/lang.php +++ /dev/null @@ -1,12 +0,0 @@ -<?php -/** - * Hindi language file - * - * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - */ - -$lang['discussion'] = 'चर्चा'; -$lang['back_to_article'] = 'वापस लेख करने के लिए'; -$lang['userpage'] = 'सदस्य'; - -//Setup VIM: ex: et ts=2 : diff --git a/lang/hr/lang.php b/lang/hr/lang.php deleted file mode 100644 index cd8ba36cc..000000000 --- a/lang/hr/lang.php +++ /dev/null @@ -1,12 +0,0 @@ -<?php -/** - * Croatian language file - * - * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - */ - -$lang['discussion'] = 'Razgovor'; -$lang['back_to_article'] = 'Natrag na clanak'; -$lang['userpage'] = 'Stranica suradnika'; - -//Setup VIM: ex: et ts=2 : diff --git a/lang/hu/lang.php b/lang/hu/lang.php deleted file mode 100644 index 2227e3ba2..000000000 --- a/lang/hu/lang.php +++ /dev/null @@ -1,12 +0,0 @@ -<?php -/** - * Hungarian language file - * - * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - */ - -$lang['discussion'] = 'Vitalap'; -$lang['back_to_article'] = 'Vissza a cikket'; -$lang['userpage'] = 'Szerkesztoi lap'; - -//Setup VIM: ex: et ts=2 : diff --git a/lang/ia/lang.php b/lang/ia/lang.php deleted file mode 100644 index 7a86ad44a..000000000 --- a/lang/ia/lang.php +++ /dev/null @@ -1,11 +0,0 @@ -<?php -/** - * Interlingua language file - * - * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - */ - -$lang['discussion'] = 'Discussion'; -$lang['userpage'] = 'Pagina de usator'; - -//Setup VIM: ex: et ts=2 : diff --git a/lang/id/lang.php b/lang/id/lang.php deleted file mode 100644 index 7c0d809d5..000000000 --- a/lang/id/lang.php +++ /dev/null @@ -1,12 +0,0 @@ -<?php -/** - * Indonesian language file - * - * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - */ - -$lang['discussion'] = 'Pembicaraan'; -$lang['back_to_article'] = 'Kembali ke artikel'; -$lang['userpage'] = 'Pengguna'; - -//Setup VIM: ex: et ts=2 : diff --git a/lang/is/lang.php b/lang/is/lang.php deleted file mode 100644 index 1a23cd910..000000000 --- a/lang/is/lang.php +++ /dev/null @@ -1,12 +0,0 @@ -<?php -/** - * Icelandic language file - * - * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - */ - -$lang['discussion'] = 'Spjall'; -$lang['back_to_article'] = 'Til baka á greinar'; -$lang['userpage'] = 'Notandi'; - -//Setup VIM: ex: et ts=2 : diff --git a/lang/it/lang.php b/lang/it/lang.php deleted file mode 100644 index f33da8045..000000000 --- a/lang/it/lang.php +++ /dev/null @@ -1,12 +0,0 @@ -<?php -/** - * Italian language file - * - * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - */ - -$lang['discussion'] = 'Discussione'; -$lang['back_to_article'] = 'Torna all\'articolo'; -$lang['userpage'] = 'Pagina utente'; - -//Setup VIM: ex: et ts=2 : diff --git a/lang/ja/lang.php b/lang/ja/lang.php deleted file mode 100644 index 23f65abd3..000000000 --- a/lang/ja/lang.php +++ /dev/null @@ -1,12 +0,0 @@ -<?php -/** - * Japanese language file - * - * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - */ - -$lang['discussion'] = '議論'; -$lang['back_to_article'] = '戻る記事へ'; -$lang['userpage'] = '利用者ページ'; - -//Setup VIM: ex: et ts=2 : diff --git a/lang/km/lang.php b/lang/km/lang.php deleted file mode 100644 index 32de3800d..000000000 --- a/lang/km/lang.php +++ /dev/null @@ -1,11 +0,0 @@ -<?php -/** - * Khmer language file - * - * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - */ - -$lang['discussion'] = 'ការពិភាក្សា'; -$lang['userpage'] = 'ទំព័រអ្នកប្រើប្រាស់'; - -//Setup VIM: ex: et ts=2 : diff --git a/lang/ko/lang.php b/lang/ko/lang.php deleted file mode 100644 index 265c416af..000000000 --- a/lang/ko/lang.php +++ /dev/null @@ -1,12 +0,0 @@ -<?php -/** - * Korean language file - * - * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - */ - -$lang['discussion'] = '토론'; -$lang['back_to_article'] = '위로 기사'; -$lang['userpage'] = '사용자 문서'; - -//Setup VIM: ex: et ts=2 : diff --git a/lang/la/lang.php b/lang/la/lang.php deleted file mode 100644 index 9f2fddffb..000000000 --- a/lang/la/lang.php +++ /dev/null @@ -1,11 +0,0 @@ -<?php -/** - * Latin language file - * - * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - */ - -$lang['discussion'] = 'Disputatio'; -$lang['userpage'] = 'Pagina usoris'; - -//Setup VIM: ex: et ts=2 : diff --git a/lang/lb/lang.php b/lang/lb/lang.php deleted file mode 100644 index ebf0afa35..000000000 --- a/lang/lb/lang.php +++ /dev/null @@ -1,11 +0,0 @@ -<?php -/** - * Luxembourgish language file - * - * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - */ - -$lang['discussion'] = 'Diskussioun'; -$lang['userpage'] = 'Benotzersäit'; - -//Setup VIM: ex: et ts=2 : diff --git a/lang/lt/lang.php b/lang/lt/lang.php deleted file mode 100644 index 389e6491b..000000000 --- a/lang/lt/lang.php +++ /dev/null @@ -1,12 +0,0 @@ -<? -/** - * Lithuanian language file - * - * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - */ - -$lang['discussion'] = 'Aptarimas'; -$lang['back_to_article'] = 'Atgal i straipsni'; -$lang['userpage'] = 'Naudotojo puslapis'; - -//Setup VIM: ex: et ts=2 : \ No newline at end of file diff --git a/lang/lv/lang.php b/lang/lv/lang.php deleted file mode 100644 index 39964ef8c..000000000 --- a/lang/lv/lang.php +++ /dev/null @@ -1,12 +0,0 @@ -<? -/** - * Latvian language file - * - * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) -*/ - -$lang['discussion'] = 'Diskusija'; -$lang['back_to_article'] = 'Atpakaļ uz rakstu'; -$lang['userpage'] = 'Lietotāja lapa'; - -//Setup VIM: ex: et ts=2 : \ No newline at end of file diff --git a/lang/mg/lang.php b/lang/mg/lang.php deleted file mode 100644 index 0ba0d5782..000000000 --- a/lang/mg/lang.php +++ /dev/null @@ -1,11 +0,0 @@ -<?php -/** - * Malagasy language file - * - * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - */ - -$lang['discussion'] = 'Dinika'; -$lang['userpage'] = 'Pejy ny mpikambana'; - -//Setup VIM: ex: et ts=2 : diff --git a/lang/mk/lang.php b/lang/mk/lang.php deleted file mode 100644 index 2be3a697a..000000000 --- a/lang/mk/lang.php +++ /dev/null @@ -1,12 +0,0 @@ -<?php -/** - * Macedonian language file - * - * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - */ - -$lang['discussion'] = 'Разговор'; -$lang['back_to_article'] = 'Назад кон статијата'; -$lang['userpage'] = 'Корисник'; - -//Setup VIM: ex: et ts=2 : diff --git a/lang/mr/lang.php b/lang/mr/lang.php deleted file mode 100644 index d72013bae..000000000 --- a/lang/mr/lang.php +++ /dev/null @@ -1,11 +0,0 @@ -<?php -/** - * Marathi language file - * - * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - */ - -$lang['discussion'] = 'चर्चा'; -$lang['userpage'] = 'सदस्य पान'; - -//Setup VIM: ex: et ts=2 : diff --git a/lang/ne/lang.php b/lang/ne/lang.php deleted file mode 100644 index 6d1b8bcd0..000000000 --- a/lang/ne/lang.php +++ /dev/null @@ -1,11 +0,0 @@ -<?php -/** - * Nepali language file - * - * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - */ - -$lang['discussion'] = 'वार्तालाप'; -$lang['userpage'] = 'प्रयोगकर्ता पृष्ठ'; - -//Setup VIM: ex: et ts=2 : diff --git a/lang/nl/lang.php b/lang/nl/lang.php deleted file mode 100644 index c6d9e3e8f..000000000 --- a/lang/nl/lang.php +++ /dev/null @@ -1,12 +0,0 @@ -<?php -/** - * Dutch language file - * - * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - */ - -$lang['discussion'] = 'Overleg'; -$lang['back_to_article'] = 'Terug naar artikel'; -$lang['userpage'] = 'Gebruikerspagina'; - -//Setup VIM: ex: et ts=2 : \ No newline at end of file diff --git a/lang/no/lang.php b/lang/no/lang.php deleted file mode 100644 index 111e571ad..000000000 --- a/lang/no/lang.php +++ /dev/null @@ -1,12 +0,0 @@ -<?php -/** - * Norwegian language file - * - * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - */ - -$lang['discussion'] = 'Diskusjon'; -$lang['back_to_article'] = 'Tilbake til artikkelen'; -$lang['userpage'] = 'Brukerside'; - -//Setup VIM: ex: et ts=2 : diff --git a/lang/pl/lang.php b/lang/pl/lang.php deleted file mode 100644 index 32f0d8cd5..000000000 --- a/lang/pl/lang.php +++ /dev/null @@ -1,12 +0,0 @@ -<?php -/** - * Polish language file - * - * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - */ - -$lang['discussion'] = 'Dyskusja'; -$lang['back_to_article'] = 'Powrót do artykułu'; -$lang['userpage'] = 'Strona użytkownika'; - -//Setup VIM: ex: et ts=2 : diff --git a/lang/pt-br/lang.php b/lang/pt-br/lang.php deleted file mode 100644 index 4d6d4ddbd..000000000 --- a/lang/pt-br/lang.php +++ /dev/null @@ -1,12 +0,0 @@ -<?php -/** - * Brazilian Portuguese language file - * - * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - */ - -$lang['discussion'] = 'Discussão'; -$lang['back_to_article'] = 'Voltar ao artigo'; -$lang['userpage'] = 'Página de usuário'; - -//Setup VIM: ex: et ts=2 : diff --git a/lang/pt/lang.php b/lang/pt/lang.php deleted file mode 100644 index d11ef9af1..000000000 --- a/lang/pt/lang.php +++ /dev/null @@ -1,12 +0,0 @@ -<?php -/** - * Portuguese language file - * - * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - */ - -$lang['discussion'] = 'Discussão'; -$lang['back_to_article'] = 'Voltar ao artigo'; -$lang['userpage'] = 'Página de utilizador'; - -//Setup VIM: ex: et ts=2 : diff --git a/lang/ro/lang.php b/lang/ro/lang.php deleted file mode 100644 index 15b01a605..000000000 --- a/lang/ro/lang.php +++ /dev/null @@ -1,12 +0,0 @@ -<?php -/** - * Romanian language file - * - * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - */ - -$lang['discussion'] = 'Discuție'; -$lang['back_to_article'] = 'Înapoi la articol'; -$lang['userpage'] = 'Pagină de utilizator'; - -//Setup VIM: ex: et ts=2 : diff --git a/lang/ru/lang.php b/lang/ru/lang.php deleted file mode 100644 index b3e3eaccf..000000000 --- a/lang/ru/lang.php +++ /dev/null @@ -1,12 +0,0 @@ -<?php -/** - * Russian language file - * - * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - */ - -$lang['discussion'] = 'Обсуждение'; -$lang['back_to_article'] = 'Назад к статье'; -$lang['userpage'] = 'Участник'; - -//Setup VIM: ex: et ts=2 : diff --git a/lang/sk/lang.php b/lang/sk/lang.php deleted file mode 100644 index 9113c6468..000000000 --- a/lang/sk/lang.php +++ /dev/null @@ -1,12 +0,0 @@ -<?php -/** - * Slovak language file - * - * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - */ - -$lang['discussion'] = 'Diskusia'; -$lang['back_to_article'] = 'Späť na článok'; -$lang['userpage'] = 'Stránka používateľa'; - -//Setup VIM: ex: et ts=2 : diff --git a/lang/sl/lang.php b/lang/sl/lang.php deleted file mode 100644 index 9c7e9f5c6..000000000 --- a/lang/sl/lang.php +++ /dev/null @@ -1,12 +0,0 @@ -<? -/** - * Slovenian language file - * - * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - */ - -$lang['discussion'] = 'Pogovor'; -$lang['back_to_article'] = 'Nazaj na članek'; -$lang['userpage'] = 'Uporabniška stran'; - -//Setup VIM: ex: et ts=2 : diff --git a/lang/sq/lang.php b/lang/sq/lang.php deleted file mode 100644 index 236d7d54f..000000000 --- a/lang/sq/lang.php +++ /dev/null @@ -1,12 +0,0 @@ -<?php -/** - * Albanian language file - * - * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - */ - -$lang['discussion'] = 'Diskutimet'; -$lang['back_to_article'] = 'Kthehu tek artikulli'; -$lang['userpage'] = 'Përdoruesi'; - -//Setup VIM: ex: et ts=2 : diff --git a/lang/sr/lang.php b/lang/sr/lang.php deleted file mode 100644 index 1212cff9f..000000000 --- a/lang/sr/lang.php +++ /dev/null @@ -1,8 +0,0 @@ -<?php -/** - * Serbian language file - * - * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - */ - -$lang['discussion'] = 'Разговор'; diff --git a/lang/sv/lang.php b/lang/sv/lang.php deleted file mode 100644 index 262a8182e..000000000 --- a/lang/sv/lang.php +++ /dev/null @@ -1,12 +0,0 @@ -<?php -/** - * Swedish language file - * - * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - */ - -$lang['discussion'] = 'Diskussion'; -$lang['back_to_article'] = 'Tillbaka till artikeln'; -$lang['userpage'] = 'Användarsida'; - -//Setup VIM: ex: et ts=2 : diff --git a/lang/th/lang.php b/lang/th/lang.php deleted file mode 100644 index 9c0de5fe2..000000000 --- a/lang/th/lang.php +++ /dev/null @@ -1,12 +0,0 @@ -<?php -/** - * Thai language file - * - * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - */ - -$lang['discussion'] = 'อภิปราย'; -$lang['back_to_article'] = 'กลับไปที่บทความ'; -$lang['userpage'] = 'หน้าผู้ใช้'; - -//Setup VIM: ex: et ts=2 : diff --git a/lang/tr/lang.php b/lang/tr/lang.php deleted file mode 100644 index f0032710a..000000000 --- a/lang/tr/lang.php +++ /dev/null @@ -1,12 +0,0 @@ -<?php -/** - * Turkish language file - * - * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - */ - -$lang['discussion'] = 'Tartışma'; -$lang['back_to_article'] = 'Geri makalenin'; -$lang['userpage'] = 'Kullanıcı sayfası'; - -//Setup VIM: ex: et ts=2 : diff --git a/lang/uk/lang.php b/lang/uk/lang.php deleted file mode 100644 index e2ae7dd0c..000000000 --- a/lang/uk/lang.php +++ /dev/null @@ -1,12 +0,0 @@ -<?php -/** - * Ukrainian language file - * - * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - */ - -$lang['discussion'] = 'Обговорення'; -$lang['back_to_article'] = 'Назад до статті'; -$lang['userpage'] = 'Сторінка користувача'; - -//Setup VIM: ex: et ts=2 : diff --git a/lang/vi/lang.php b/lang/vi/lang.php deleted file mode 100644 index b7bae028a..000000000 --- a/lang/vi/lang.php +++ /dev/null @@ -1,12 +0,0 @@ -<?php -/** - * Vietnamese language file - * - * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - */ - -$lang['discussion'] = 'Thảo luận'; -$lang['back_to_article'] = 'Trở lại bài viết'; -$lang['userpage'] = 'Thành viên'; - -//Setup VIM: ex: et ts=2 : diff --git a/lang/zh-tw/lang.php b/lang/zh-tw/lang.php deleted file mode 100644 index 72c5813c2..000000000 --- a/lang/zh-tw/lang.php +++ /dev/null @@ -1,12 +0,0 @@ -<?php -/** - * Chinese (Traditional) language file - * - * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - */ - -$lang['discussion'] = '討論'; -$lang['back_to_article'] = '回到文章'; -$lang['userpage'] = '用戶頁面'; // 使用者頁面 - -//Setup VIM: ex: et ts=2 : diff --git a/lang/zh/lang.php b/lang/zh/lang.php deleted file mode 100644 index c95d98517..000000000 --- a/lang/zh/lang.php +++ /dev/null @@ -1,12 +0,0 @@ -<?php -/** - * Chinese (Simplified) language file - * - * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - */ - -$lang['discussion'] = '讨论'; -$lang['back_to_article'] = '回到文章'; -$lang['userpage'] = '用户页面'; - -//Setup VIM: ex: et ts=2 : -- cgit v1.2.3 From 0e336ca8d49c813f535e69d9e727aa58356d5197 Mon Sep 17 00:00:00 2001 From: Andreas Gohr <andi@splitbrain.org> Date: Mon, 6 Feb 2012 18:12:57 +0100 Subject: moved files to template hierarchy for merging with core --- README | 5 - css/_admin.css | 47 --- css/_diff.css | 65 --- css/_edit.css | 128 ------ css/_fileuploader.css | 112 ----- css/_footnotes.css | 28 -- css/_forms.css | 82 ---- css/_imgdetail.css | 30 -- css/_links.css | 65 --- css/_media_fullscreen.css | 457 --------------------- css/_media_popup.css | 205 --------- css/_mediamanager.css | 219 ---------- css/_modal.css | 83 ---- css/_recent.css | 69 ---- css/_search.css | 93 ----- css/_tabs.css | 40 -- css/_toc.css | 77 ---- css/basic.css | 381 ----------------- css/content.css | 148 ------- css/design.css | 463 --------------------- css/includes.css | 4 - css/mobile.css | 192 --------- css/pagetools.css | 208 ---------- css/print.css | 127 ------ css/rtl.css | 571 -------------------------- css/structure.css | 58 --- detail.php | 144 ------- images/apple-touch-icon.png | Bin 17728 -> 0 bytes images/bullet.png | Bin 199 -> 0 bytes images/closed.png | Bin 165 -> 0 bytes images/favicon.ico | Bin 7406 -> 0 bytes images/link_icon.gif | Bin 942 -> 0 bytes images/logo.png | Bin 12212 -> 0 bytes images/mail_icon.gif | Bin 918 -> 0 bytes images/open.png | Bin 174 -> 0 bytes images/pagetools-license.txt | 4 - images/pagetools-sprite.png | Bin 14507 -> 0 bytes images/pagetools-sprite.xcf | Bin 34257 -> 0 bytes images/pagetools.xcf | Bin 14393 -> 0 bytes images/resizecol.png | Bin 225 -> 0 bytes images/search.png | Bin 400 -> 0 bytes images/toc-arrows.png | Bin 322 -> 0 bytes images/toc-bullet.png | Bin 211 -> 0 bytes images/windows.gif | Bin 223 -> 0 bytes lib/tpl/dokuwiki/README | 5 + lib/tpl/dokuwiki/css/_admin.css | 47 +++ lib/tpl/dokuwiki/css/_diff.css | 65 +++ lib/tpl/dokuwiki/css/_edit.css | 128 ++++++ lib/tpl/dokuwiki/css/_fileuploader.css | 112 +++++ lib/tpl/dokuwiki/css/_footnotes.css | 28 ++ lib/tpl/dokuwiki/css/_forms.css | 82 ++++ lib/tpl/dokuwiki/css/_imgdetail.css | 30 ++ lib/tpl/dokuwiki/css/_links.css | 65 +++ lib/tpl/dokuwiki/css/_media_fullscreen.css | 457 +++++++++++++++++++++ lib/tpl/dokuwiki/css/_media_popup.css | 205 +++++++++ lib/tpl/dokuwiki/css/_mediamanager.css | 219 ++++++++++ lib/tpl/dokuwiki/css/_modal.css | 83 ++++ lib/tpl/dokuwiki/css/_recent.css | 69 ++++ lib/tpl/dokuwiki/css/_search.css | 93 +++++ lib/tpl/dokuwiki/css/_tabs.css | 40 ++ lib/tpl/dokuwiki/css/_toc.css | 77 ++++ lib/tpl/dokuwiki/css/basic.css | 381 +++++++++++++++++ lib/tpl/dokuwiki/css/content.css | 148 +++++++ lib/tpl/dokuwiki/css/design.css | 463 +++++++++++++++++++++ lib/tpl/dokuwiki/css/includes.css | 4 + lib/tpl/dokuwiki/css/mobile.css | 192 +++++++++ lib/tpl/dokuwiki/css/pagetools.css | 208 ++++++++++ lib/tpl/dokuwiki/css/print.css | 127 ++++++ lib/tpl/dokuwiki/css/rtl.css | 571 ++++++++++++++++++++++++++ lib/tpl/dokuwiki/css/structure.css | 58 +++ lib/tpl/dokuwiki/detail.php | 144 +++++++ lib/tpl/dokuwiki/images/apple-touch-icon.png | Bin 0 -> 17728 bytes lib/tpl/dokuwiki/images/bullet.png | Bin 0 -> 199 bytes lib/tpl/dokuwiki/images/closed.png | Bin 0 -> 165 bytes lib/tpl/dokuwiki/images/favicon.ico | Bin 0 -> 7406 bytes lib/tpl/dokuwiki/images/link_icon.gif | Bin 0 -> 942 bytes lib/tpl/dokuwiki/images/logo.png | Bin 0 -> 12212 bytes lib/tpl/dokuwiki/images/mail_icon.gif | Bin 0 -> 918 bytes lib/tpl/dokuwiki/images/open.png | Bin 0 -> 174 bytes lib/tpl/dokuwiki/images/pagetools-license.txt | 4 + lib/tpl/dokuwiki/images/pagetools-sprite.png | Bin 0 -> 14507 bytes lib/tpl/dokuwiki/images/pagetools-sprite.xcf | Bin 0 -> 34257 bytes lib/tpl/dokuwiki/images/pagetools.xcf | Bin 0 -> 14393 bytes lib/tpl/dokuwiki/images/resizecol.png | Bin 0 -> 225 bytes lib/tpl/dokuwiki/images/search.png | Bin 0 -> 400 bytes lib/tpl/dokuwiki/images/toc-arrows.png | Bin 0 -> 322 bytes lib/tpl/dokuwiki/images/toc-bullet.png | Bin 0 -> 211 bytes lib/tpl/dokuwiki/images/windows.gif | Bin 0 -> 223 bytes lib/tpl/dokuwiki/main.php | 100 +++++ lib/tpl/dokuwiki/mediamanager.php | 48 +++ lib/tpl/dokuwiki/style.ini | 73 ++++ lib/tpl/dokuwiki/template.info.txt | 7 + lib/tpl/dokuwiki/tpl_footer.php | 6 + lib/tpl/dokuwiki/tpl_functions.php | 30 ++ lib/tpl/dokuwiki/tpl_header.php | 83 ++++ main.php | 100 ----- mediamanager.php | 48 --- style.ini | 73 ---- template.info.txt | 7 - tpl_footer.php | 6 - tpl_functions.php | 30 -- tpl_header.php | 83 ---- 102 files changed, 4452 insertions(+), 4452 deletions(-) delete mode 100644 README delete mode 100644 css/_admin.css delete mode 100644 css/_diff.css delete mode 100644 css/_edit.css delete mode 100644 css/_fileuploader.css delete mode 100644 css/_footnotes.css delete mode 100644 css/_forms.css delete mode 100644 css/_imgdetail.css delete mode 100644 css/_links.css delete mode 100644 css/_media_fullscreen.css delete mode 100644 css/_media_popup.css delete mode 100644 css/_mediamanager.css delete mode 100644 css/_modal.css delete mode 100644 css/_recent.css delete mode 100644 css/_search.css delete mode 100644 css/_tabs.css delete mode 100644 css/_toc.css delete mode 100644 css/basic.css delete mode 100644 css/content.css delete mode 100644 css/design.css delete mode 100644 css/includes.css delete mode 100644 css/mobile.css delete mode 100644 css/pagetools.css delete mode 100644 css/print.css delete mode 100644 css/rtl.css delete mode 100644 css/structure.css delete mode 100644 detail.php delete mode 100644 images/apple-touch-icon.png delete mode 100644 images/bullet.png delete mode 100644 images/closed.png delete mode 100644 images/favicon.ico delete mode 100644 images/link_icon.gif delete mode 100644 images/logo.png delete mode 100644 images/mail_icon.gif delete mode 100644 images/open.png delete mode 100644 images/pagetools-license.txt delete mode 100644 images/pagetools-sprite.png delete mode 100644 images/pagetools-sprite.xcf delete mode 100644 images/pagetools.xcf delete mode 100644 images/resizecol.png delete mode 100644 images/search.png delete mode 100644 images/toc-arrows.png delete mode 100644 images/toc-bullet.png delete mode 100644 images/windows.gif create mode 100644 lib/tpl/dokuwiki/README create mode 100644 lib/tpl/dokuwiki/css/_admin.css create mode 100644 lib/tpl/dokuwiki/css/_diff.css create mode 100644 lib/tpl/dokuwiki/css/_edit.css create mode 100644 lib/tpl/dokuwiki/css/_fileuploader.css create mode 100644 lib/tpl/dokuwiki/css/_footnotes.css create mode 100644 lib/tpl/dokuwiki/css/_forms.css create mode 100644 lib/tpl/dokuwiki/css/_imgdetail.css create mode 100644 lib/tpl/dokuwiki/css/_links.css create mode 100644 lib/tpl/dokuwiki/css/_media_fullscreen.css create mode 100644 lib/tpl/dokuwiki/css/_media_popup.css create mode 100644 lib/tpl/dokuwiki/css/_mediamanager.css create mode 100644 lib/tpl/dokuwiki/css/_modal.css create mode 100644 lib/tpl/dokuwiki/css/_recent.css create mode 100644 lib/tpl/dokuwiki/css/_search.css create mode 100644 lib/tpl/dokuwiki/css/_tabs.css create mode 100644 lib/tpl/dokuwiki/css/_toc.css create mode 100644 lib/tpl/dokuwiki/css/basic.css create mode 100644 lib/tpl/dokuwiki/css/content.css create mode 100644 lib/tpl/dokuwiki/css/design.css create mode 100644 lib/tpl/dokuwiki/css/includes.css create mode 100644 lib/tpl/dokuwiki/css/mobile.css create mode 100644 lib/tpl/dokuwiki/css/pagetools.css create mode 100644 lib/tpl/dokuwiki/css/print.css create mode 100644 lib/tpl/dokuwiki/css/rtl.css create mode 100644 lib/tpl/dokuwiki/css/structure.css create mode 100644 lib/tpl/dokuwiki/detail.php create mode 100644 lib/tpl/dokuwiki/images/apple-touch-icon.png create mode 100644 lib/tpl/dokuwiki/images/bullet.png create mode 100644 lib/tpl/dokuwiki/images/closed.png create mode 100644 lib/tpl/dokuwiki/images/favicon.ico create mode 100644 lib/tpl/dokuwiki/images/link_icon.gif create mode 100644 lib/tpl/dokuwiki/images/logo.png create mode 100644 lib/tpl/dokuwiki/images/mail_icon.gif create mode 100644 lib/tpl/dokuwiki/images/open.png create mode 100644 lib/tpl/dokuwiki/images/pagetools-license.txt create mode 100644 lib/tpl/dokuwiki/images/pagetools-sprite.png create mode 100644 lib/tpl/dokuwiki/images/pagetools-sprite.xcf create mode 100644 lib/tpl/dokuwiki/images/pagetools.xcf create mode 100644 lib/tpl/dokuwiki/images/resizecol.png create mode 100644 lib/tpl/dokuwiki/images/search.png create mode 100644 lib/tpl/dokuwiki/images/toc-arrows.png create mode 100644 lib/tpl/dokuwiki/images/toc-bullet.png create mode 100644 lib/tpl/dokuwiki/images/windows.gif create mode 100644 lib/tpl/dokuwiki/main.php create mode 100644 lib/tpl/dokuwiki/mediamanager.php create mode 100644 lib/tpl/dokuwiki/style.ini create mode 100644 lib/tpl/dokuwiki/template.info.txt create mode 100644 lib/tpl/dokuwiki/tpl_footer.php create mode 100644 lib/tpl/dokuwiki/tpl_functions.php create mode 100644 lib/tpl/dokuwiki/tpl_header.php delete mode 100644 main.php delete mode 100644 mediamanager.php delete mode 100644 style.ini delete mode 100644 template.info.txt delete mode 100644 tpl_footer.php delete mode 100644 tpl_functions.php delete mode 100644 tpl_header.php diff --git a/README b/README deleted file mode 100644 index 966fc45f1..000000000 --- a/README +++ /dev/null @@ -1,5 +0,0 @@ -Starter Template for DokuWiki -http://www.dokuwiki.org/template:starter - -version: 2011-02-20 -author: Anika Henke <anika@selfthinker.org> diff --git a/css/_admin.css b/css/_admin.css deleted file mode 100644 index e4664367c..000000000 --- a/css/_admin.css +++ /dev/null @@ -1,47 +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; -} - -.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; -} - -.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; -} diff --git a/css/_diff.css b/css/_diff.css deleted file mode 100644 index 62f831213..000000000 --- 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 5a3952c90..000000000 --- a/css/_edit.css +++ /dev/null @@ -1,128 +0,0 @@ -/** - * This file provides styles for the edit view (?do=edit), preview - * and section edit buttons. - */ - -/* edit view -********************************************************************/ - -/*____________ toolbar ____________*/ - -.dokuwiki div.toolbar { - margin-bottom: .5em; - overflow: hidden; -} -.dokuwiki div.toolbar #draft__status { - float: right; - color: __text_alt__; - background-color: inherit; -} -.dokuwiki div.toolbar #tool__bar { - float: left; -} - -/* 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 { - overflow: hidden; - margin-bottom: .5em; -} - -/* size and wrap controls */ -.dokuwiki #wiki__editbar #size__ctl { - float: right; -} -.dokuwiki #wiki__editbar #size__ctl img { - cursor: pointer; -} - -/* edit buttons */ -.dokuwiki #wiki__editbar .editButtons { - display: inline; - margin-right: 1em; -} -.dokuwiki #wiki__editbar .editButtons input { -} - -/* summary input and minor changes checkbox */ -.dokuwiki #wiki__editbar .summary { - display: inline; -} -.dokuwiki #wiki__editbar .summary label { - vertical-align: middle; - white-space: nowrap; -} -.dokuwiki #wiki__editbar .summary label span { - vertical-align: middle; -} -.dokuwiki #wiki__editbar .summary input { -} -/* change background colour if summary is missing */ -.dokuwiki #wiki__editbar .summary input.missing { - 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; -} -.dokuwiki .secedit input.button { - font-size: 75%; -} - -/* generic style for section highlighting (including headings) */ -.dokuwiki .section_highlight { -} -/* style for section highlighting (only sections below headings) */ -.dokuwiki div.section_highlight { - margin: -3em -1em -.01em -1em; /* negative side margin = side padding + side border */ - padding: 3em .5em .01em .5em; - border: solid __background_alt__; - border-width: 0 .5em; -} diff --git a/css/_fileuploader.css b/css/_fileuploader.css deleted file mode 100644 index 42004de28..000000000 --- a/css/_fileuploader.css +++ /dev/null @@ -1,112 +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 */ - -.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 a20f2964e..000000000 --- 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 804584725..000000000 --- a/css/_forms.css +++ /dev/null @@ -1,82 +0,0 @@ - -/* TODO */ - -/** - * 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; -} - -.dokuwiki label.simple { - display: block; - text-align: left; - font-weight: normal; -} - -.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 - */ - -form#subscribe__form { - display: block; - width: 400px; - 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/css/_imgdetail.css b/css/_imgdetail.css deleted file mode 100644 index a3e0f55f5..000000000 --- a/css/_imgdetail.css +++ /dev/null @@ -1,30 +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; -} -#dokuwiki__detail div.img_detail { - float: left; -} - -#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 6b19c3a24..000000000 --- a/css/_links.css +++ /dev/null @@ -1,65 +0,0 @@ -/** - * This file provides styles for all types of links. - */ - -/*____________ links to wiki pages ____________*/ - -/* existing wikipage */ -.dokuwiki a.wikilink1 { - color: __existing__; - background-color: inherit; -} -/* not existing wikipage */ -.dokuwiki a.wikilink2 { - color: __missing__; - background-color: inherit; - 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 20px; -} -/* external link */ -.dokuwiki a.urlextern { - background-image: url(images/link_icon.gif); - padding: 0 0 0 17px; -} -/* windows share */ -.dokuwiki a.windows { - background-image: url(images/windows.gif); -} -/* email link */ -.dokuwiki a.mail { - background-image: url(images/mail_icon.gif); -} - -/* 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 { - padding: 0 0 0 17px; -} diff --git a/css/_media_fullscreen.css b/css/_media_fullscreen.css deleted file mode 100644 index 3bf48e9ec..000000000 --- a/css/_media_fullscreen.css +++ /dev/null @@ -1,457 +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; -} - -#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__; -} - - -#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 ____________*/ - -#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.4em; -} -* html #mediamanager__page .namespaces h2, -*+html #mediamanager__page .namespaces h2 { - display: inline; -} - -#mediamanager__page .namespaces ul { - margin-left: .2em; - margin-bottom: 0; - padding: 0; - list-style: none; -} -#mediamanager__page .namespaces ul ul { - margin-left: 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; -} - -#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: .3em .5em; - line-height: 1; -} - -/* file list content */ - -#mediamanager__page .filelist ul { - padding: 0; - margin: 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; -} -* 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 { - margin-left: 10px; - padding: 0; - list-style-type: none; -} - -#mediamanager__page #page__revisions ul li div.li div { - font-size: 90%; - color: __text_neu__; - padding-left: 18px; -} - -#mediamanager__page #page__revisions ul li div.li input { - 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__; -} - -#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 .image1, -#mediamanager__diff .imageDiff .image2 { - width: 97%; -} -#mediamanager__diff .imageDiff .image2 { - position: absolute; - top: 0; - left: 0; -} - -#mediamanager__diff .imageDiff.opacity .image2 { - opacity: 0.5; -} - -#mediamanager__diff .imageDiff.portions .image2 { - border-right: 1px solid red; - overflow: hidden; -} - -#mediamanager__diff .imageDiff img { - width: 100%; -} - diff --git a/css/_media_popup.css b/css/_media_popup.css deleted file mode 100644 index 0469c8e60..000000000 --- a/css/_media_popup.css +++ /dev/null @@ -1,205 +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__; -} -#mediamgr__aside .pad { - padding: .5em; -} - -#mediamgr__content { - width: 69.7%; - height: 100%; - overflow: auto; - position: absolute; - right: 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; -} -#media__opts label { -} - -/*____________ tree ____________*/ - -#media__tree ul { - padding-left: .2em; -} -#media__tree ul li { - clear: left; - list-style-type: none; - list-style-image: none; - margin-left: 0; -} -#media__tree ul li img { - float: left; - padding: .5em .3em 0 0; -} -#media__tree ul li div.li { - display: inline; -} -#media__tree ul li li { - margin-left: 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; -} -#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; -} -#media__content div.detail div.thumb a { - display: block; - cursor: pointer; -} -#media__content div.detail p { - margin-bottom: 0; -} - - -/*____________ media search ____________*/ - -form#dw__mediasearch { -} -form#dw__mediasearch p { -} -form#dw__mediasearch label { -} -form#dw__mediasearch label span { -} -form#dw__mediasearch input.edit { -} -form#dw__mediasearch input.button { -} - - -/* meta edit form -********************************************************************/ - -#media__content form.meta { -} - -#media__content form.meta div.metafield { - clear: left; - margin-bottom: .5em; - overflow: hidden; -} - -#media__content form.meta label { - display: block; - width: 25%; - float: left; - font-weight: bold; - clear: left; -} -#media__content form.meta .edit { - float: left; - width: 70%; - margin: 0; -} -#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%; -} diff --git a/css/_mediamanager.css b/css/_mediamanager.css deleted file mode 100644 index d47e581ff..000000000 --- a/css/_mediamanager.css +++ /dev/null @@ -1,219 +0,0 @@ -/** - * This file provides styles for the media manager - * (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__; -} -#mediamgr__aside .pad { - padding: .5em; -} - -#mediamgr__content { - width: 69.7%; - height: 100%; - overflow: auto; - position: absolute; - right: 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; -} -#media__opts label { -} - -/*____________ tree ____________*/ - -#media__tree ul { - padding-left: .2em; -} -#media__tree ul li { - clear: left; - list-style-type: none; - list-style-image: none; - margin-left: 0; -} -#media__tree ul li img { - float: left; - padding: .5em .3em 0 0; -} -#media__tree ul li div.li { - display: inline; -} -#media__tree ul li li { - margin-left: 1.5em; -} - -/* right side -********************************************************************/ - -/*____________ upload form ____________*/ - -/* upload info */ -#media__content div.upload { - font-size: .9em; - margin-bottom: .5em; -} - -#media__content form#dw__upload, -#media__content div#dw__flashupload { - display: block; - border-bottom: solid 1px __border__; - padding-bottom: 1em; - margin-bottom: 1em; -} -#media__content form#dw__upload p { - margin-bottom: .5em; -} - -#media__content form#dw__upload label { -} -#media__content form#dw__upload label.check { -} -#media__content form#dw__upload input.check { -} -#media__content form#dw__upload input.edit { -} -#media__content form#dw__upload img { -} - -/*____________ 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; -} -#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; -} -#media__content div.detail div.thumb a { - display: block; -} -#media__content div.detail p { - margin-bottom: 0; -} - - -/*____________ media search ____________*/ - -form#dw__mediasearch { -} -form#dw__mediasearch p { -} -form#dw__mediasearch label { -} -form#dw__mediasearch label span { -} -form#dw__mediasearch input.edit { -} -form#dw__mediasearch input.button { -} - - -/* meta edit form -********************************************************************/ - -#media__content form.meta { -} - -#media__content form.meta div.metafield { - clear: left; - margin-bottom: .5em; - overflow: hidden; -} - -#media__content form.meta label { - display: block; - width: 25%; - float: left; - font-weight: bold; - clear: left; -} -#media__content form.meta .edit { - float: left; - width: 70%; - margin: 0; -} -#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%; -} diff --git a/css/_modal.css b/css/_modal.css deleted file mode 100644 index 125f702a8..000000000 --- a/css/_modal.css +++ /dev/null @@ -1,83 +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; -} - -#link__wiz_result div { - padding: 3px 3px 3px 0; -} - -#link__wiz_result div a { - display: block; - padding-left: 22px; - min-height: 16px; - background: transparent 3px center no-repeat; -} - -#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; -} - - -/* 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; -} - -#media__popup_content .button { - margin-right: 1px; - cursor: pointer; -} diff --git a/css/_recent.css b/css/_recent.css deleted file mode 100644 index 68f0e5826..000000000 --- a/css/_recent.css +++ /dev/null @@ -1,69 +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 */ -.dokuwiki #dw__recent label { - margin-bottom: .5em; - display: block; -} - -.dokuwiki #dw__recent ul li, -.dokuwiki #page__revisions ul li { - list-style: none; - margin-left: 0; -} -.dokuwiki #dw__recent ul li span, -.dokuwiki #dw__recent ul li a, -.dokuwiki #page__revisions ul li span, -.dokuwiki #page__revisions ul li a { - vertical-align: middle; -} -.dokuwiki #dw__recent ul li span.user a, -.dokuwiki #page__revisions ul li span.user a { - vertical-align: bottom; -} -.dokuwiki #dw__recent ul li.minor, -.dokuwiki #page__revisions ul li.minor { - opacity: .7; -} - -.dokuwiki #dw__recent li span.date, -.dokuwiki #page__revisions li span.date { -} -.dokuwiki #dw__recent li a.diff_link, -.dokuwiki #page__revisions li a.diff_link { - vertical-align: baseline; -} -.dokuwiki #dw__recent li a.revisions_link, -.dokuwiki #page__revisions li a.revisions_link { - vertical-align: baseline; -} -.dokuwiki #dw__recent li a.wikilink1, -.dokuwiki #dw__recent li a.wikilink2, -.dokuwiki #page__revisions li a.wikilink1, -.dokuwiki #page__revisions li a.wikilink2 { -} -.dokuwiki #dw__recent li span.sum, -.dokuwiki #page__revisions li span.sum { - font-weight: bold; -} -.dokuwiki #dw__recent li span.user, -.dokuwiki #page__revisions li span.user { -} - - -/*____________ 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 70824fc43..000000000 --- a/css/_search.css +++ /dev/null @@ -1,93 +0,0 @@ -/** - * This file provides styles for the search results page (?do=search) - * and the AJAX search popup. - */ - -/* search results page -********************************************************************/ - -/* loading gif */ -.dokuwiki #dw__loading { -} - -/*____________ 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; -} - -/*____________ search results ____________*/ - -/* container for one search result */ -.dokuwiki div.search_result { - margin-bottom: 1.4em; -} -/* search snippet */ -.dokuwiki div.search_result div.search_snippet { - color: __text_alt__; - background-color: inherit; -} - -/* 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 { - font-weight: normal; -} -/* ellipsis separating snippets */ -.dokuwiki div.search_result .search_sep { - 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; -} - -/* .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; -} -.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 de544fd2b..000000000 --- a/css/_tabs.css +++ /dev/null @@ -1,40 +0,0 @@ -/** - * This file provides the styles for general tabs. - */ - -.dokuwiki ul.tabs { - padding: 0; - margin: 0; - overflow: hidden; -} -.dokuwiki ul.tabs li { - float: left; - padding: 0; - margin: 0; - list-style: none; -} - -.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; -} -.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/css/_toc.css b/css/_toc.css deleted file mode 100644 index b78817523..000000000 --- a/css/_toc.css +++ /dev/null @@ -1,77 +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 { - float: right; - margin: 0 0 1.4em 1.4em; - width: 12em; - background-color: __background_alt__; - color: inherit; -} - -/*____________ toc header ____________*/ - -.dokuwiki div.tocheader { - padding: .2em .5em; - font-weight: bold; -} - -.dokuwiki .toc span.toc_open, -.dokuwiki .toc span.toc_close { - float: right; - margin: 0 .2em; -} - -/*____________ toc list ____________*/ - -.dokuwiki #toc__inside { - padding: .2em .5em; -} -.dokuwiki #toc__inside ul { - padding: 0; - margin: 0; -} -.dokuwiki #toc__inside ul li { - list-style: none; - padding: 0; - margin: 0; - line-height: 1.1; -} -.dokuwiki #toc__inside ul li div.li { - padding: .15em 0; -} -.dokuwiki #toc__inside ul ul { - padding-left: 1em; -} -.dokuwiki #toc__inside ul ul li { -} -.dokuwiki #toc__inside ul li a { -} - -/* 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 { -} - - -/* sitemap (and backlinks) -********************************************************************/ - -.dokuwiki ul.idx { - padding-left: 0; -} -.dokuwiki ul.idx li { - list-style-image: url(images/bullet.png); -} -.dokuwiki ul.idx li.open { - list-style-image: url(images/open.png); -} -.dokuwiki ul.idx li.closed { - list-style-image: url(images/closed.png); -} diff --git a/css/basic.css b/css/basic.css deleted file mode 100644 index ae9be499e..000000000 --- a/css/basic.css +++ /dev/null @@ -1,381 +0,0 @@ -/** - * This file provides the most basic styles. - * - * If you integrate DokuWiki into another project, you might either - * want to integrate this file into the other project as well, or use - * the other project's basic CSS for DokuWiki instead of this one. - * - * @author Anika Henke <anika@selfthinker.org> - */ - -html { - overflow-x: auto; - overflow-y: scroll; -} -html, -body { - color: __text__; - background-color: __background_site__; - background-image: -moz-linear-gradient( top, __background_neu__ 0%, __background_alt__ 1em, __background_site__ 4em); - background-image: -webkit-linear-gradient(top, __background_neu__ 0%, __background_alt__ 1em, __background_site__ 4em); - background-image: -o-linear-gradient( top, __background_neu__ 0%, __background_alt__ 1em, __background_site__ 4em); - background-image: -ms-linear-gradient( top, __background_neu__ 0%, __background_alt__ 1em, __background_site__ 4em); - background-image: linear-gradient( top, __background_neu__ 0%, __background_alt__ 1em, __background_site__ 4em); - background-size: 1px 10em; - background-repeat: repeat-x; - margin: 0; - padding: 0; -} -body { - font: normal 87.5%/1.4 Arial, sans-serif; - /* default font size: 100% => 16px; 93.75% => 15px; 87.5% => 14px; 81.25% => 13px; 75% => 12px */ -} - - -/*____________ headers ____________*/ - -h1, -h2, -h3, -h4, -h5, -h6, -caption, -legend { - font-family: Arial, sans-serif; - font-weight: bold; - background-color: inherit; - padding: 0; - line-height: 1.2; - clear: left; /* ideally 'both', but problems with toc */ -} - -h1 { - font-size: 2em; - margin: -.222em 0 0.444em; -} -h2 { - font-size: 1.5em; - margin: 0 0 0.666em; -} -h3 { - font-size: 1.125em; - margin: 0 0 0.888em; -} -h4 { - font-size: 1em; - margin: 0 0 1.0em; -} -h5 { - font-size: .875em; - margin: 0 0 1.1428em; -} -h6 { - font-size: .75em; - margin: 0 0 1.333em; -} -/* bottom margin = 1 / font-size */ - - -/*____________ basic margins and paddings ____________*/ - -p, -ul, -ol, -dl, -pre, -table, -hr, -blockquote, -fieldset, -address { - margin: 0 0 1.4em 0; /* bottom margin = line-height */ - padding: 0; -} - -div { - margin: 0; - padding: 0; -} - - -/*____________ lists ____________*/ - -ul, -ol { - padding: 0 0 0 1.5em; -} -li, -dd { - padding: 0; - margin: 0 0 0 1.5em; -} -dt { - font-weight: bold; - margin: 0; - padding: 0; -} - -li ul, -li ol, -li dl, -dl ul, -dl ol, -dl dl { - margin-bottom: 0; - padding: 0; -} -li li { - font-size: 100%; -} - -ul { list-style: square outside; } -ol { list-style: decimal outside; } -ol ol { list-style-type: lower-alpha; } -ol ol ol { list-style-type: upper-roman; } -ol ol ol ol { list-style-type: upper-alpha; } -ol ol ol ol ol { list-style-type: lower-roman; } - - -/*____________ tables ____________*/ - -table { - border-collapse: collapse; - empty-cells: show; - border-spacing: 0; - border: 1px solid __border__; -} - -caption { - caption-side: top; - text-align: left; - margin: 0 0 .3em; -} - -th, -td { - padding: .3em .5em; - margin: 0; - vertical-align: top; - border: 1px solid __border__; - text-align: left; -} -th { - font-weight: bold; - background-color: __background_alt__; -} - - -/*____________ links ____________*/ - -a { - outline: none; -} -a:link, -a:visited { - text-decoration: none; - color: __link__; -} -a:link:hover, -a:visited:hover, -a:link:focus, -a:visited:focus, -a:link:active, -a:visited:active { - text-decoration: underline; -} - - -/*____________ misc ____________*/ - -img { - border-width: 0; - vertical-align: middle; - color: #666; - background-color: transparent; - font-style: italic; -} -img, -object { - max-width: 100%; -} - -hr { - border-top: solid __border__; - border-bottom: solid __background__; - border-width: 1px 0; - height: 0; - width: 100%; - text-align: center; - clear: both; -} - -acronym, -abbr { - cursor: help; - border-bottom: 1px dotted; - font-style: normal; -} - -pre, -code, -samp, -kbd { - font-family: Consolas, "Andale Mono WT", "Andale Mono", "Bitstream Vera Sans Mono", "Nimbus Mono L", Monaco, "Courier New", monospace; - /* same font stack should be used for ".dokuwiki table.diff td" in _diff.css */ - font-size: 1em; - direction: ltr; - text-align: left; -} -pre { - overflow: auto; - word-wrap: normal; -} - -blockquote { - padding: 0 .5em; - border: solid __border__; - border-width: 0 0 0 .25em; -} -q:before, -q:after { - content: ''; -} - -sub, -sup { - font-size: .8em; - line-height: 1; -} -sub { - vertical-align: sub; -} -sup { - vertical-align: super; -} - -/*____________ forms ____________*/ - -/* for all of the form styles, style.ini colours are not used on purpose (except for fieldset border) */ - -form { - display: inline; - margin: 0; - padding: 0; -} -fieldset { - padding: 1em 1em 0; - border: 1px solid __text_alt__; -} -legend { - margin: 0; - padding: 0 .1em; -} -label { - vertical-align: middle; - cursor: pointer; -} - -input, -textarea, -button, -select, -optgroup, -option { - font: inherit; - font-weight: normal; - color: #333; - background-color: #fff; - line-height: 1; - margin: 0; - vertical-align: middle; - -moz-box-sizing: border-box; - -webkit-box-sizing: border-box; - box-sizing: border-box; -} - -optgroup { - font-style: italic; - font-weight: bold; -} -option { - font-style: normal; - font-weight: normal; -} - -input, -textarea, -select { - border: 1px solid #ccc; - box-shadow: inset 0 0 1px #eee; - border-radius: 2px; -} -input:active, -input:focus, -textarea:active, -textarea:focus, -select:active, -select:focus { - border-color: #999; -} -input[type=radio], -input[type=checkbox] { - padding: 0; - border-width: 0; - box-shadow: none; -} - -/* all types of buttons */ -input[type=submit], -input.button, -a.button, -button, -.qq-upload-button { - color: #333; - background-color: #eee; - background: -moz-linear-gradient( top, #ffffff 0%, #f4f4f4 30%, #eeeeee 99%, #cccccc 99%); - background: -webkit-linear-gradient(top, #ffffff 0%, #f4f4f4 30%, #eeeeee 99%, #cccccc 99%); - background: -o-linear-gradient( top, #ffffff 0%, #f4f4f4 30%, #eeeeee 99%, #cccccc 99%); - background: -ms-linear-gradient( top, #ffffff 0%, #f4f4f4 30%, #eeeeee 99%, #cccccc 99%); - background: linear-gradient( top, #ffffff 0%, #f4f4f4 30%, #eeeeee 99%, #cccccc 99%); - border: 1px solid #ccc; - border-radius: 2px; - padding: .1em .5em; - cursor: pointer; -} - -input[type=submit]:hover, -input[type=submit]:active, -input[type=submit]:focus, -input.button:hover, -input.button:active, -input.button:focus, -a.button:hover, -a.button:active, -a.button:focus, -button:hover, -button:active, -button:focus, -.qq-upload-button:hover { - border-color: #999; - background-color: #ddd; - background: -moz-linear-gradient( top, #ffffff 0%, #f4f4f4 30%, #dddddd 99%, #cccccc 99%); - background: -webkit-linear-gradient(top, #ffffff 0%, #f4f4f4 30%, #dddddd 99%, #bbbbbb 99%); - background: -o-linear-gradient( top, #ffffff 0%, #f4f4f4 30%, #dddddd 99%, #cccccc 99%); - background: -ms-linear-gradient( top, #ffffff 0%, #f4f4f4 30%, #dddddd 99%, #cccccc 99%); - background: linear-gradient( top, #ffffff 0%, #f4f4f4 30%, #dddddd 99%, #bbbbbb 99%); -} - -input::-moz-focus-inner, -button::-moz-focus-inner { - border: 0; - padding: 0; -} - -input[disabled], -button[disabled], -input[readonly], -button[readonly] { - cursor: auto; -} - diff --git a/css/content.css b/css/content.css deleted file mode 100644 index 4e9f8cbe1..000000000 --- a/css/content.css +++ /dev/null @@ -1,148 +0,0 @@ -/** - * This file provides the main design styles for the page content. - * - * @author Anika Henke <anika@selfthinker.org> - * @author Andreas Gohr <andi@splitbrain.org> - * @author Clarence Lee <clarencedglee@gmail.com> - */ - - -/*____________ section indenting ____________ - -.dokuwiki.page h1 {margin-left: 0;} -.dokuwiki.page h2 {margin-left: .666em;} -.dokuwiki.page h3 {margin-left: 1.776em;} -.dokuwiki.page h4 {margin-left: 3em;} -.dokuwiki.page h5 {margin-left: 4.5712em;} -.dokuwiki.page div.level1 {margin-left: 0;} -.dokuwiki.page div.level2 {margin-left: 1em;} -.dokuwiki.page div.level3 {margin-left: 2em;} -.dokuwiki.page div.level4 {margin-left: 3em;} -.dokuwiki.page div.level5 {margin-left: 4em;} -*/ -/* hx margin-left = (1 / font-size) * .levelx-margin */ - - -/*____________ images ____________*/ - -/* embedded images (styles are already partly set in lib/styles/all.css) */ -.dokuwiki img.media { -} -.dokuwiki img.medialeft { - margin: .5em 1.5em .5em 0; -} -.dokuwiki img.mediaright { - margin: .5em 0 .5em 1.5em; -} -.dokuwiki img.mediacenter { - margin: .5em auto; -} - - -/*____________ lists ____________*/ - -.dokuwiki #dokuwiki__content ul li, -.dokuwiki #dokuwiki__aside ul li { - color: __text_alt__; -} -.dokuwiki #dokuwiki__content ol li, -.dokuwiki #dokuwiki__aside ol li { - color: __text_neu__; -} -.dokuwiki #dokuwiki__content li .li, -.dokuwiki #dokuwiki__aside li .li { - color: __text__; -} - - -/*____________ tables ____________*/ - -.dokuwiki div.table { - width: 100%; - overflow-x: auto; - margin-bottom: 1.4em; -} -.dokuwiki div.table table { - margin-bottom: 0; -} - -.dokuwiki table.inline { - min-width: 50%; - border-width: 0; -} -.dokuwiki table.inline th, -.dokuwiki table.inline td { - border: 1px solid __border__; -} -.dokuwiki table.inline th { - color: inherit; - background-color: __background_alt__; -} -.dokuwiki table.inline td { -} -.dokuwiki table.inline tr:hover td { - background-color: __background_alt__; -} -.dokuwiki table.inline tr:hover th { - background-color: __border__; -} - - -/*____________ code ____________*/ - -.dokuwiki pre, -.dokuwiki tt, -.dokuwiki code, -.dokuwiki samp, -.dokuwiki kbd { - background-color: __background_alt__; - color: __text__; -} -/* fix if background-color hides underlining */ -.dokuwiki em.u code { - text-decoration: underline; -} -.dokuwiki pre { - border: 1px solid __border__; - padding: .75em 1em; -} -/* for code in <file> */ -.dokuwiki pre.file { -} - -/* filenames for downloadable file and code blocks */ -.dokuwiki dl.code, -.dokuwiki dl.file { -} - -.dokuwiki dl.code dt, -.dokuwiki dl.file dt { - background-color: __background_alt__; - background: -moz-linear-gradient( top, __background__ 0%, __background_alt__ 100%); - background: -webkit-linear-gradient(top, __background__ 0%, __background_alt__ 100%); - background: -o-linear-gradient( top, __background__ 0%, __background_alt__ 100%); - background: -ms-linear-gradient( top, __background__ 0%, __background_alt__ 100%); - background: linear-gradient( top, __background__ 0%, __background_alt__ 100%); - color: inherit; - border: 1px solid __border__; - border-bottom-color: __background_alt__; - border-top-left-radius: .3em; - border-top-right-radius: .3em; - padding: .3em .6em .1em; - margin-bottom: -1px; - float: left; -} -.dokuwiki dl.code dt a, -.dokuwiki dl.file dt a { - background-color: transparent; - font-size: 0.875em; - font-weight: normal; - display: block; - min-height: 16px; -} -.dokuwiki dl.code dd, -.dokuwiki dl.file dd { - margin: 0; - clear: left; -} - diff --git a/css/design.css b/css/design.css deleted file mode 100644 index 39d793f99..000000000 --- a/css/design.css +++ /dev/null @@ -1,463 +0,0 @@ -/** - * This file provides the main design styles for the - * bits that surround the content. - * - * @author Anika Henke <anika@selfthinker.org> - * @author Andreas Gohr <andi@splitbrain.org> - * @author Clarence Lee <clarencedglee@gmail.com> - */ - -/* header -********************************************************************/ - -#dokuwiki__header { - padding: 2em 0 1.5em; -} - -#dokuwiki__header .headings, -#dokuwiki__header .tools { - margin-bottom: 1.5em; - width: 49%; -} -#dokuwiki__header h1 img { - float: left; - margin-right: .5em; -} -#dokuwiki__header h1 span { - display: block; - padding-top: 10px; -} -#dokuwiki__header h1 { - margin: 0; - font-size: 1.5em; - font-weight: normal; -} -#dokuwiki__header h1 a { - text-decoration: none; - color: __text__; - background-color: inherit; -} -#dokuwiki__header h1 a:hover, -#dokuwiki__header h1 a:active, -#dokuwiki__header h1 a:focus { -} -#dokuwiki__header p.claim { - margin-bottom: 0; - font-size: 0.875em; -} - -#dokuwiki__header .tools { - margin-top: .2em; -} - - -/* tools -********************************************************************/ - -/* highlight selected tool */ -.mode_admin a.action.admin, -.mode_login a.action.login, -.mode_register a.action.register, -.mode_profile a.action.profile, -.mode_recent a.action.recent, -.mode_index a.action.index, -.mode_revisions a.action.revs, -.mode_backlink a.action.backlink, -.mode_subscribe a.action.subscribe { - font-weight: bold; -} - -#dokuwiki__header .tools ul { - padding-left: 0; - margin-bottom: 0; -} -#dokuwiki__header .tools li { - font-size: 0.875em; - margin-left: 1em; - list-style: none; - display: inline; -} -#dokuwiki__header .tools form.search div.ajax_qsearch li { - font-size: 1em; - margin-left: 0; - display: block; - overflow: hidden; - text-overflow: ellipsis; -} - -#dokuwiki__header .mobileTools { - display: none; /* hide mobile tools dropdown to only show in mobile view */ -} - -/*____________ user tools ____________*/ - -#dokuwiki__usertools { - position: absolute; - top: .5em; - right: .5em; - text-align: right; - width: 100%; -} -#dokuwiki__usertools ul { - margin: 0 auto; - padding: 0; - max-width: __site_width__; -} -#dokuwiki__usertools ul li.user { -} - - -/*____________ site tools ____________*/ - -#dokuwiki__sitetools { - text-align: right; -} - -#dokuwiki__sitetools form.search { - display: block; - font-size: 0.875em; - position: relative; -} -#dokuwiki__sitetools form.search input.edit { - width: 18em; - padding: .35em 22px .35em .1em; -} -#dokuwiki__sitetools form.search input.button { - background: transparent url(images/search.png) no-repeat 0 0; - border-width: 0; - width: 19px; - height: 14px; - text-indent: -99999px; - margin-left: -20px; - box-shadow: none; - padding: 0; -} - -#dokuwiki__sitetools ul { - margin-top: 0.5em; -} -#dokuwiki__sitetools li { -} - -/*____________ breadcrumbs ____________*/ - -.dokuwiki div.breadcrumbs { - border-top: 1px solid __border__; - border-bottom: 1px solid __background__; - margin-bottom: .5em; - font-size: 0.875em; - clear: both; -} -.dokuwiki div.breadcrumbs div { - padding: .1em .35em; -} - -.dokuwiki div.breadcrumbs div:only-child { - border-top: 1px solid __background__; - border-bottom: 1px solid __border__; -} -.dokuwiki div.breadcrumbs div:first-child { - border-top: 1px solid __background__; -} -#IE7 .dokuwiki div.breadcrumbs div, -#IE8 .dokuwiki div.breadcrumbs div { - border-bottom: 1px solid __border__; -} -.dokuwiki div.breadcrumbs div:last-child { - border-bottom: 1px solid __border__; -} - -.dokuwiki div.breadcrumbs a { - color: __link__; - background-color: inherit; -} -.dokuwiki div.breadcrumbs .bcsep { - font-size: 0.75em; -} - - -/* sidebar -********************************************************************/ - -#dokuwiki__aside { -} -#dokuwiki__aside .pad { - font-size: 0.875em; - overflow: hidden; - word-wrap: break-word; -} - -/* make sidebar more condensed */ - -#dokuwiki__aside h1 { - margin-bottom: .222em; -} -#dokuwiki__aside h2 { - margin-bottom: .333em; -} -#dokuwiki__aside h3 { - margin-bottom: .444em; -} -#dokuwiki__aside h4 { - margin-bottom: .5em; -} -#dokuwiki__aside h5 { - margin-bottom: .5714em; -} - -#dokuwiki__aside p, -#dokuwiki__aside ul, -#dokuwiki__aside ol, -#dokuwiki__aside dl, -#dokuwiki__aside pre, -#dokuwiki__aside table, -#dokuwiki__aside fieldset, -#dokuwiki__aside hr, -#dokuwiki__aside blockquote, -#dokuwiki__aside address { - margin-bottom: .7em; -} - -#dokuwiki__aside ul, -#dokuwiki__aside ol { - padding-left: 0; -} -#dokuwiki__aside li ul, -#dokuwiki__aside li ol { - margin-bottom: 0; -} - -#dokuwiki__aside a:link, -#dokuwiki__aside a:visited { - color: __link__; - background-color: inherit; -} - - -/* content -********************************************************************/ - -#dokuwiki__content { -} - -.dokuwiki .pageId { - position: absolute; - top: -2.3em; - right: -1em; - overflow: hidden; - padding: 1em 1em 0; -} -.dokuwiki .pageId span { - font-size: 0.875em; - border: solid __background_alt__; - border-width: 1px 1px 0; - background-color: __background__; - color: __text_alt__; - padding: .1em .35em; - border-top-left-radius: 2px; - border-top-right-radius: 2px; - box-shadow: 0 0 .5em #999; - display: block; -} - -.dokuwiki div.page { - background: __background__; - color: inherit; - border: 1px solid #eee; - box-shadow: 0 0 .5em #999; - border-radius: 2px; - padding: 2em; - margin-bottom: .5em; - overflow: hidden; - word-wrap: break-word; -} - -.dokuwiki .docInfo { - font-size: 0.875em; - text-align: right; -} - -/*____________ misc ____________*/ - -/* license note under edit window */ -.dokuwiki div.license { - font-size: 93.75%; -} -/* license note in footer */ -.dokuwiki #dokuwiki__footer div.license { - font-size: 100%; -} - -#IE7 .dokuwiki input.button, -#IE7 .dokuwiki button { - line-height: 1.4; -} - -#acl__tree li { - margin: 0; -} - -.dokuwiki #dokuwiki__content span.curid a { - font-weight: normal; -} -.dokuwiki #dokuwiki__content strong span.curid a { - font-weight: bold; -} - - -/*____________ changes to _edit ____________*/ - -.dokuwiki div.toolbar button.toolbutton { - border-radius: 0; - border-left-width: 0; - padding: .1em .35em; -} -.dokuwiki div.toolbar button.toolbutton:first-child { - border-top-left-radius: 4px; - border-bottom-left-radius: 4px; - border-left-width: 1px; -} -.dokuwiki div.toolbar button.toolbutton:last-child { - border-top-right-radius: 4px; - border-bottom-right-radius: 4px; -} - -.dokuwiki div.section_highlight { - margin: -3em -2em -.01em -2em; - padding: 3em 1em .01em 1em; - border-width: 0 1em; -} - -.dokuwiki textarea.edit { - font-family: Consolas, "Andale Mono WT", "Andale Mono", "Bitstream Vera Sans Mono", "Liberation Mono", Monaco, "Courier New", monospace; -} - -.dokuwiki div.preview { - margin: 0 -2em; - padding: 2em; -} - - -/*____________ changes to _toc ____________*/ - -.dokuwiki div.toc { - margin: -2em -2em .5em 1.4em; - width: __sidebar_width__; - border-left: 1px solid __border__; - background: __background__; - color: inherit; -} - -.dokuwiki div.tocheader { - padding: .5em 1em; - margin-bottom: 0; - font-size: .875em; - letter-spacing: .1em; -} - -.dokuwiki .toc span.toc_open, -.dokuwiki .toc span.toc_close { - background: transparent url(images/toc-arrows.png) 0 0; - width: 8px; - height: 5px; - margin: .4em 0 0; -} -.dokuwiki .toc span.toc_open { - background-position: 0 -5px; -} - -.dokuwiki .toc span.toc_open span, -.dokuwiki .toc span.toc_close span { - display: none; -} - - -.dokuwiki #toc__inside { - font-size: 0.875em; - padding: .5em 1em 1em; -} -.dokuwiki #toc__inside ul { - padding: 0 0 0 1.2em; -} -.dokuwiki #toc__inside ul li { - list-style-image: url(images/toc-bullet.png); -} -.dokuwiki #toc__inside ul li.clear { - list-style: none; -} -.dokuwiki #toc__inside ul li div.li { - padding: .2em 0; -} - - -/*____________ changes to _imgdetail ____________*/ - -#dokuwiki__detail { - padding: 0; -} -#dokuwiki__detail img { - float: none; - margin-bottom: 1.4em; -} -#dokuwiki__detail div.img_detail { - float: none; -} - -#dokuwiki__detail div.img_detail dl { - overflow: hidden; -} -#dokuwiki__detail div.img_detail dl dt { - float: left; - width: 9em; - text-align: right; - clear: left; -} -#dokuwiki__detail div.img_detail dl dd { - margin-left: 9.5em; -} - - -/*____________ JS popup ____________*/ - -.JSpopup { - background-color: __background__; - color: __text__; - border: 1px solid __border__; - box-shadow: .1em .1em .1em __border__; - border-radius: 2px; - padding: .3em .5em; - font-size: .9em; -} -.dokuwiki form.search div.ajax_qsearch { - top: -.35em; - font-size: 1em; - text-overflow: ellipsis; -} - -.JSpopup ul, -.JSpopup ol { - padding-left: 0; -} - - -/* footer -********************************************************************/ - -.dokuwiki .wrapper { - margin-bottom: 1.4em; -} - -#dokuwiki__footer { - margin-bottom: 1em; -} -#dokuwiki__footer .pad { - font-size: 0.875em; -} -#dokuwiki__footer div.license { - text-align: center; -} -#dokuwiki__footer .license img { - margin: 0 .5em 0 0; - float: none; -} - diff --git a/css/includes.css b/css/includes.css deleted file mode 100644 index bc189962f..000000000 --- a/css/includes.css +++ /dev/null @@ -1,4 +0,0 @@ -/** - * This file provides styles for included seperate html files - * (added through "include hooks"). - */ diff --git a/css/mobile.css b/css/mobile.css deleted file mode 100644 index 38242f5be..000000000 --- a/css/mobile.css +++ /dev/null @@ -1,192 +0,0 @@ -/** - * This file provides styles for mobile devices - * and smaller screens (up to 480px and 768px width). - * - * @author Anika Henke <anika@selfthinker.org> - */ - -/* up to 768px screen widths -********************************************************************/ -@media only screen and (max-width: 768px), only screen and (max-device-width: 960px) { - -/* structure */ -#dokuwiki__aside { - width: 100%; - float: none; -} -#dokuwiki__aside .pad { - margin: 0 0 .5em; -} - -.hasSidebar #dokuwiki__content { - float: none; - margin-left: 0; - width: 100%; -} -.hasSidebar #dokuwiki__content .pad { - margin-left: 0; -} - -/* toc */ -.dokuwiki div.toc { - float: none; - margin: 0 0 1em 0; - width: auto; - border-left-width: 0; - border-bottom: 1px solid __border__; -} -.dokuwiki div.tocheader { - padding: 0 0 .5em; -} -.dokuwiki #toc__inside { - padding: .2em 0 .5em; -} - -/* page */ -.dokuwiki div.page { - padding: 1em; -} -.dokuwiki .pageId span { - border-width: 0; - background-color: __background_site__; - color: __text_alt__; - box-shadow: 0 0 0; -} - -/* _edit */ -.dokuwiki div.section_highlight { - margin: -3em -1em -.01em -1em; - padding: 3em .5em .01em .5em; - border-width: 0 .5em; -} -.dokuwiki div.preview { - margin: 0 -1em; - padding: 1em; -} - - -} /* /@media */ - - -/* up to 480px screen widths -********************************************************************/ -@media only screen and (max-width: 480px), only screen and (max-device-width: 960px) { - -/*____________ structure ____________*/ - -#dokuwiki__site { - max-width: 100%; -} -#dokuwiki__site .site { - padding: 0 .5em; -} -#dokuwiki__header { - padding: .5em 0; -} - -/*____________ header ____________*/ - -#dokuwiki__header ul.a11y.skip { - position: static !important; - left: 0 !important; - width: auto !important; - height: auto !important; - float: right; - font-size: 0.875em; - list-style: none; - padding-left: 0; - margin: 0; -} -#dokuwiki__header ul.a11y.skip li { - margin-left: .35em; - display: inline; -} - -#dokuwiki__header .headings, -#dokuwiki__header .tools { - float: none; - text-align: left; - width: auto; - margin-bottom: .5em; -} -#dokuwiki__sitetools { - text-align: left; -} -#dokuwiki__usertools, -#dokuwiki__sitetools ul, -#dokuwiki__sitetools h3, -#dokuwiki__pagetools, -.dokuwiki div.breadcrumbs, /* @todo: maybe move breadcrumbs to the bottom? */ -.dokuwiki .pageId { - display: none; -} - -/* search form */ -#dokuwiki__sitetools form.search { - float: left; - margin: 0 .2em .2em 0; - width: 49%; -} -#dokuwiki__sitetools form.search input.edit { - width: 100% !important; -} -.dokuwiki form.search div.ajax_qsearch { - display: none !important; -} - -/* action dropdown is alternative for all hidden tools */ -#dokuwiki__header .mobileTools { - display: block; - font-size: 0.875em; - margin: 0 0 .2em 0; - float: right; - width: 49%; -} -#dokuwiki__header .mobileTools select { - padding: .3em .1em; - width: 100% !important; -} - - -/*____________ content ____________*/ - -.dokuwiki div.page { - padding: .5em; -} - -/* form elements */ -#config__manager fieldset td.value, -#config__manager td .input, -.dokuwiki fieldset, -.dokuwiki input.edit, -.dokuwiki textarea, -.dokuwiki select { - width: auto !important; - max-width: 100% !important; -} -#config__manager fieldset { - margin-left: 0; - margin-right: 0; -} - -.dokuwiki label.block { - text-align: left; -} -.dokuwiki label.block span { - display: block; -} - -/* _edit */ -.dokuwiki div.section_highlight { - margin: 0; - padding: 0; - border-width: 0; -} -.dokuwiki div.preview { - margin: 0 -.5em; - padding: .5em; -} - - - -} /* /@media */ diff --git a/css/pagetools.css b/css/pagetools.css deleted file mode 100644 index a25032f0b..000000000 --- a/css/pagetools.css +++ /dev/null @@ -1,208 +0,0 @@ -/** - * This file provides the styles for the page tools - * (fly out navigation beside the page to edit, etc). - * - * @author Anika Henke <anika@selfthinker.org> - * @author Andreas Gohr <andi@splitbrain.org> - */ - -#dokuwiki__site .site { - /* give space to the right so the tools won't disappear on smaller screens */ - /* it's 40px because the 30px wide icons will have 5px more spacing to the left and right */ - padding-right: 40px; - /* give the same space to the left to balance it out */ - padding-left: 40px; -} -.dokuwiki div.page { - min-height: 190px; /* 30 (= height of icons) x 6 (= maximum number of possible tools) + 2x5 */ -} -#dokuwiki__usertools { - /* move the tools just outside of the site */ - right: 40px; -} - - -#dokuwiki__pagetools { - position: absolute; - right: -40px; - /* on same vertical level as first headline, because .page has 2em padding */ - top: 2em; -} - -#dokuwiki__pagetools div.tools { - position: fixed; -} - -#dokuwiki__pagetools ul { - position: absolute; - right: 0; - text-align: right; - margin: 0; - padding: 0; - /* add transparent border to prevent jumping when proper border is added on hover */ - border: 1px solid transparent; -} - -#dokuwiki__pagetools ul li { - padding: 0; - margin: 0; - list-style: none; - font-size: 0.875em; -} - -#dokuwiki__pagetools ul li a { - display: block; - min-height: 20px; /* 30 - 2x5 */ - line-height: 20px; - padding: 5px 40px 5px 5px; - background-image: url(images/pagetools-sprite.png); - background-position: right 0; - background-repeat: no-repeat; - /* add transparent border to prevent jumping when proper border is added on focus */ - border: 1px solid transparent; - white-space: nowrap; -} - -/* hide labels accessibly when neither on hover nor on focus */ -#dokuwiki__pagetools ul li a span { - position: absolute; - left: -99999px; -} - -/* show all tools on hover and individual tools on focus */ -#dokuwiki__pagetools:hover ul, -#dokuwiki__pagetools ul li a:focus { - background-color: __background__; - border-color: __border__; - border-radius: 2px; - box-shadow: 2px 2px 2px __text_alt__; -} - -#dokuwiki__pagetools:hover ul li a span, -#dokuwiki__pagetools ul li a:focus span { - display: inline; - position: static; -} - -#dokuwiki__pagetools ul li a:hover, -#dokuwiki__pagetools ul li a:active, -#dokuwiki__pagetools ul li a:focus { - text-decoration: none; -} -#dokuwiki__pagetools ul li a:hover { - background-color: __background_alt__; -} - -/*____________ all available icons in sprite ____________*/ - -#dokuwiki__pagetools ul li a.edit { - background-position: right 0; -} -#dokuwiki__pagetools ul li a.edit:hover, -#dokuwiki__pagetools ul li a.edit:active, -#dokuwiki__pagetools ul li a.edit:focus { - background-position: right -45px; -} - -#dokuwiki__pagetools ul li a.create { - background-position: right -90px; -} -#dokuwiki__pagetools ul li a.create:hover, -#dokuwiki__pagetools ul li a.create:active, -#dokuwiki__pagetools ul li a.create:focus { - background-position: right -135px; -} - -#dokuwiki__pagetools ul li a.show { - background-position: right -270px; -} -#dokuwiki__pagetools ul li a.show:hover, -#dokuwiki__pagetools ul li a.show:active, -#dokuwiki__pagetools ul li a.show:focus { - background-position: right -315px; -} - -#dokuwiki__pagetools ul li a.source { - background-position: right -360px; -} -#dokuwiki__pagetools ul li a.source:hover, -#dokuwiki__pagetools ul li a.source:active, -#dokuwiki__pagetools ul li a.source:focus { - background-position: right -405px; -} - -#dokuwiki__pagetools ul li a.draft { - background-position: right -180px; -} -#dokuwiki__pagetools ul li a.draft:hover, -#dokuwiki__pagetools ul li a.draft:active, -#dokuwiki__pagetools ul li a.draft:focus { - background-position: right -225px; -} - -#dokuwiki__pagetools ul li a.revs { - background-position: right -540px; -} -#dokuwiki__pagetools ul li a.revs:hover, -#dokuwiki__pagetools ul li a.revs:active, -#dokuwiki__pagetools ul li a.revs:focus, -.mode_revisions #dokuwiki__pagetools ul li a.revs { - background-position: right -585px; -} - -#dokuwiki__pagetools ul li a.backlink { - background-position: right -630px; -} -#dokuwiki__pagetools ul li a.backlink:hover, -#dokuwiki__pagetools ul li a.backlink:active, -#dokuwiki__pagetools ul li a.backlink:focus, -.mode_backlink #dokuwiki__pagetools ul li a.backlink { - background-position: right -675px; -} - -#dokuwiki__pagetools ul li a.top { - background-position: right -810px; -} -#dokuwiki__pagetools ul li a.top:hover, -#dokuwiki__pagetools ul li a.top:active, -#dokuwiki__pagetools ul li a.top:focus { - background-position: right -855px; -} - -#dokuwiki__pagetools ul li a.revert { - background-position: right -450px; -} -#dokuwiki__pagetools ul li a.revert:hover, -#dokuwiki__pagetools ul li a.revert:active, -#dokuwiki__pagetools ul li a.revert:focus, -.mode_revert #dokuwiki__pagetools ul li a.revert { - background-position: right -495px; -} - -#dokuwiki__pagetools ul li a.subscribe { - background-position: right -720px; -} -#dokuwiki__pagetools ul li a.subscribe:hover, -#dokuwiki__pagetools ul li a.subscribe:active, -#dokuwiki__pagetools ul li a.subscribe:focus, -.mode_subscribe #dokuwiki__pagetools ul li a.subscribe { - background-position: right -765px; -} - -#dokuwiki__pagetools ul li a.mediaManager { - background-position: right -900px; -} -#dokuwiki__pagetools ul li a.mediaManager:hover, -#dokuwiki__pagetools ul li a.mediaManager:active, -#dokuwiki__pagetools ul li a.mediaManager:focus { - background-position: right -945px; -} - -#dokuwiki__pagetools ul li a.back { - background-position: right -990px; -} -#dokuwiki__pagetools ul li a.back:hover, -#dokuwiki__pagetools ul li a.back:active, -#dokuwiki__pagetools ul li a.back:focus { - background-position: right -1035px; -} diff --git a/css/print.css b/css/print.css deleted file mode 100644 index d20d0f464..000000000 --- a/css/print.css +++ /dev/null @@ -1,127 +0,0 @@ -/** - * This file provides the styles for printing. - * - * @todo: improve and finish - */ - -body { - /* - font: normal 12pt/1.2 serif; - color: #000; - background-color: #fff; - */ -} - -/* hide certain sections */ -.a11y, -div.notify, div.info, div.success, div.error, -#dokuwiki__header .tools, #dokuwiki__aside, -.dokuwiki .breadcrumbs, .dokuwiki .toc, .dokuwiki .secedit, -#dokuwiki__pagetools, #dokuwiki__footer { - display: none; -} - -.dokuwiki h1, .dokuwiki h2, .dokuwiki h3, .dokuwiki h4, .dokuwiki h5, -.dokuwiki caption, .dokuwiki legend { - clear: both; -} -.dokuwiki ul { list-style: disc outside; } -.dokuwiki ol { list-style: decimal outside; } -.dokuwiki ol ol { list-style-type: lower-alpha; } -.dokuwiki ol ol ol { list-style-type: upper-roman; } -.dokuwiki ol ol ol ol { list-style-type: upper-alpha; } -.dokuwiki ol ol ol ol ol { list-style-type: lower-roman; } - -/* undo icons */ -.dokuwiki a:link, .dokuwiki a:visited { - text-decoration: underline; - color: #333; - background-color: inherit; - background-image: none; - padding: 0; -} - -/* display href after link */ -a.urlextern:after, -a.interwiki:after, -a.mail:after { - content: " [" attr(href) "]"; - font-size: 90%; -} - -/* code blocks */ -.dokuwiki pre { - font-family: monospace; -} -.dokuwiki dl.code dt, .dokuwiki dl.file dt { - font-weight: bold; -} - -/* images */ -.dokuwiki img { border-width: 0; vertical-align: middle; } -.dokuwiki img.medialeft { margin: .5em 1.5em .5em 0; float: left; } -.dokuwiki img.mediaright { margin: .5em 0 .5em 1.5em; float: right; } -.dokuwiki img.mediacenter { margin: .5em auto; display: block; } - -/* align table cells */ -.dokuwiki .leftalign { text-align: left; } -.dokuwiki .centeralign { text-align: center; } -.dokuwiki .rightalign { text-align: right; } - -/* underline */ -.dokuwiki em.u { font-style: normal; text-decoration: underline; } -.dokuwiki em em.u { font-style: italic; } - -div.clearer { - clear: both; - line-height: 0; - height: 0; - overflow: hidden; -} - -.dokuwiki blockquote { - padding: 0 10pt; - margin: 0; - border: solid #ccc; - border-width: 0 0 0 2pt; -} - -/* tables */ -.dokuwiki table { - border-collapse: collapse; - empty-cells: show; - border-spacing: 0; - border: 1pt solid #ccc; -} -.dokuwiki th, .dokuwiki td { - padding: 3pt 5pt; - margin: 0; - vertical-align: top; - border: 1pt solid #666; - text-align: left; -} -.dokuwiki th { - font-weight: bold; -} - - -/*____________ a bit of layout ____________*/ - -#dokuwiki__header { - border-bottom: 2pt solid #ccc; -} -#dokuwiki__header h1 { - font-size: 1.5em; -} -#dokuwiki__header h1 a { - text-decoration: none; -} -#dokuwiki__header h1 img { - float: left; - margin-right: .5em; -} -.dokuwiki div.footnotes { - clear: both; - border-top: 1pt solid #000; - margin-top: 10pt; -} diff --git a/css/rtl.css b/css/rtl.css deleted file mode 100644 index 790545a1b..000000000 --- a/css/rtl.css +++ /dev/null @@ -1,571 +0,0 @@ -/** - * This file provides layout and design corrections for right-to-left - * languages. - * - * @author Anika Henke <anika@selfthinker.org> - */ - -/*____________ basic ____________*/ - -caption, -td, -th { - text-align: right; -} - -ul, ol { - padding: 0 1.5em 0 0; -} -li, dd { - margin: 0 1.5em 0 0; -} -blockquote { - border-width: 0 .25em 0 0; -} - -h1, h2, h3, h4, h5, h6, -caption, legend { - clear: right; -} - -.a11y { - left: auto; - right: -9000px; -} - - -/*____________ _imgdetail ____________*/ - -#dokuwiki__detail div.content img { - float: right; - margin-right: 0; - margin-left: 1.5em; -} -#dokuwiki__detail div.content div.img_detail { - float: right -} - - -/*____________ _mediamanager ____________*/ - -#mediamgr__aside { - left: auto; - right: 0; - border-right-width: 0; - border-left: 1px solid __border__; -} -#mediamgr__content { - right: auto; - left: 0; -} - -#media__opts input { - margin-right: 0; - margin-left: .3em; -} - -#media__tree ul { - padding-left: 0; - padding-right: .2em; -} -#media__tree ul li { - clear: right; - margin-right: 0; -} -#media__tree ul li img { - float: right; - padding: .5em 0 0 .3em; -} -#media__tree ul li li { - margin-left: 0; - margin-right: 1.5em; -} - -#media__content a.mediafile { - margin-right: 0; - margin-left: 1.5em; -} -#media__content div.detail div.thumb { - float: right; - margin: 0 18px 0 .5em; -} -#media__content form.meta div.metafield { - clear: right; -} -#media__content form.meta label { - float: right; - clear: right; -} -#media__content form.meta .edit { - float: right; -} -#media__content form.meta div.buttons { - clear: right; - margin: .2em 25% 0 0; -} - - -/*____________ _links ____________*/ - -/* if link icons don't work as expected, remove the following lines */ -.dokuwiki a.urlextern, -.dokuwiki a.windows, -.dokuwiki a.mail, -.dokuwiki a.interwiki, -.dokuwiki a.mediafile { - background-position: right center; - padding: 0 17px 0 0; -} - - -/*____________ _toc ____________*/ - -.dokuwiki div.toc { - float: left; - margin: 0 1.4em 1.4em 0; -} -.dokuwiki .toc span.toc_open, -.dokuwiki .toc span.toc_close { - float: left; -} -.dokuwiki #toc__inside ul ul { - padding-left: 0; - padding-right: 1em; -} - -.dokuwiki ul.idx { - padding-right: 0; -} - - -/*____________ _footnotes ____________*/ - - -/*____________ _search ____________*/ - -.dokuwiki div.search_quickresult ul li { - float: right; -} -.dokuwiki form.search div.ajax_qsearch { - left: auto; - right: -13.5em; - text-align: right; -} - - -/*____________ _recent ____________*/ - -.dokuwiki #dw__recent ul li, -.dokuwiki #page__revisions ul li { - margin-right: 0; -} - - -/*____________ _diff ____________*/ - - -/*____________ _edit ____________*/ - -.dokuwiki div.toolbar #draft__status { - float: left; -} -.dokuwiki #wiki__editbar #size__ctl { - float: left; -} -.dokuwiki #wiki__editbar #size__ctl img { - cursor: pointer; -} -.dokuwiki #wiki__editbar .editButtons { - margin-right: 0; - margin-left: 1em; -} - -.dokuwiki .secedit { - float: left; -} - - -/*____________ _modal ____________*/ - -#link__wiz_close { - float: left; -} -#link__wiz_result { - text-align: right; -} -#link__wiz_result div.type_u, -#link__wiz_result div.type_f, -#link__wiz_result div.type_d { - padding: 3px 22px 3px 3px; - background-position: 257px 3px; -} - - -/*____________ _forms ____________*/ - -.dokuwiki label.block { - text-align: left; -} -.dokuwiki label.simple { - text-align: right; -} - -form#subscribe__form fieldset { - text-align: right; -} - - -/*____________ _admin ____________*/ - -.dokuwiki ul.admin_tasks { - float: right; -} -.dokuwiki ul.admin_tasks li { - padding-left: 0; - padding-right: 35px; - background-position: right 0; -} - -.dokuwiki #admin__version { - clear: right; - float: left; -} - - -/*____________ includes ____________*/ - - -/*____________ structure ____________*/ - -#dokuwiki__header .headings { - float: right; - text-align: right; -} -#dokuwiki__header .tools { - float: left; - text-align: left; -} - -#dokuwiki__aside { - float: right; -} -#dokuwiki__aside .pad { - margin: 0 0 0 1.5em; -} - -.hasSidebar #dokuwiki__content { - float: left; - margin-left: 0; - margin-right: -__sidebar_width__; -} -.hasSidebar #dokuwiki__content .pad { - margin-left: 0; - margin-right: __sidebar_width__; -} - -/*____________ design ____________*/ - -#dokuwiki__header h1 img { - float: right; - margin-left: .5em; - margin-right: 0; -} - -#dokuwiki__sitetools form.search input.edit { - padding: .35em .1em .35em 22px; -} -#dokuwiki__sitetools form.search input.button { - background-position: 5px 0; - margin-left: 0; - margin-right: -20px; -} - -#dokuwiki__usertools { - text-align: left; - left: 40px; - right: auto; -} - -#dokuwiki__sitetools { - text-align: left; -} - -#dokuwiki__aside ul, #dokuwiki__aside ol { - padding-right: 0; -} - -.dokuwiki .pageId { - right: auto; - left: -1em; -} - -.dokuwiki .docInfo { - text-align: left; -} - -.dokuwiki div.toolbar button.toolbutton:first-child { - border-top-left-radius: 0; - border-bottom-left-radius: 0; - border-top-right-radius: 4px; - border-bottom-right-radius: 4px; - border-left-width: 0; - border-right-width: 1px; -} -.dokuwiki div.toolbar button.toolbutton:last-child { - border-top-left-radius: 4px; - border-bottom-left-radius: 4px; - border-top-right-radius: 0; - border-bottom-right-radius: 0; - border-left-width: 1px; -} - -.dokuwiki div.section_highlight { - margin-right: -2em; - border-right-width: 1em; -} - -#dokuwiki__footer .license img { - margin: 0 0 0 .5em; -} - -.dokuwiki div.toc { - margin: -2em 1.4em .5em -2em; - border-left-width: 0; - border-right: 1px solid __border__; -} -.dokuwiki #toc__inside ul { - padding: 0 1.5em 0 0; -} - -#dokuwiki__detail div.img_detail dl dt { - float: right; - text-align: left; - clear: right; -} -#dokuwiki__detail div.img_detail dl dd { - margin-left: 0; - margin-right: 9.5em; -} - - -/*____________ pagetools ____________*/ - -#dokuwiki__usertools { - right: auto; - left: 40px; -} - -#dokuwiki__pagetools { - right: auto; - left: -40px; -} - -#dokuwiki__pagetools ul { - right: auto; - left: 0; - text-align: left; -} - -#dokuwiki__pagetools ul li a { - padding: 5px 5px 5px 40px; - background-position: left 0; -} - -#dokuwiki__pagetools:hover ul, -#dokuwiki__pagetools ul li a:focus { - box-shadow: -2px 2px 2px __text_alt__; -} - -/* all available icons in sprite */ -#dokuwiki__pagetools ul li a.edit { - background-position: left 0; -} -#dokuwiki__pagetools ul li a.edit:hover, -#dokuwiki__pagetools ul li a.edit:active, -#dokuwiki__pagetools ul li a.edit:focus { - background-position: left -45px; -} - -#dokuwiki__pagetools ul li a.create { - background-position: left -90px; -} -#dokuwiki__pagetools ul li a.create:hover, -#dokuwiki__pagetools ul li a.create:active, -#dokuwiki__pagetools ul li a.create:focus { - background-position: left -135px; -} - -#dokuwiki__pagetools ul li a.show { - background-position: left -270px; -} -#dokuwiki__pagetools ul li a.show:hover, -#dokuwiki__pagetools ul li a.show:active, -#dokuwiki__pagetools ul li a.show:focus { - background-position: left -315px; -} - -#dokuwiki__pagetools ul li a.source { - background-position: left -360px; -} -#dokuwiki__pagetools ul li a.source:hover, -#dokuwiki__pagetools ul li a.source:active, -#dokuwiki__pagetools ul li a.source:focus { - background-position: left -405px; -} - -#dokuwiki__pagetools ul li a.draft { - background-position: left -180px; -} -#dokuwiki__pagetools ul li a.draft:hover, -#dokuwiki__pagetools ul li a.draft:active, -#dokuwiki__pagetools ul li a.draft:focus { - background-position: left -225px; -} - -#dokuwiki__pagetools ul li a.revs { - background-position: left -540px; -} -#dokuwiki__pagetools ul li a.revs:hover, -#dokuwiki__pagetools ul li a.revs:active, -#dokuwiki__pagetools ul li a.revs:focus, -.mode_revisions #dokuwiki__pagetools ul li a.revs { - background-position: left -585px; -} - -#dokuwiki__pagetools ul li a.backlink { - background-position: left -630px; -} -#dokuwiki__pagetools ul li a.backlink:hover, -#dokuwiki__pagetools ul li a.backlink:active, -#dokuwiki__pagetools ul li a.backlink:focus, -.mode_backlink #dokuwiki__pagetools ul li a.backlink { - background-position: left -675px; -} - -#dokuwiki__pagetools ul li a.top { - background-position: left -810px; -} -#dokuwiki__pagetools ul li a.top:hover, -#dokuwiki__pagetools ul li a.top:active, -#dokuwiki__pagetools ul li a.top:focus { - background-position: left -855px; -} - -#dokuwiki__pagetools ul li a.revert { - background-position: left -450px; -} -#dokuwiki__pagetools ul li a.revert:hover, -#dokuwiki__pagetools ul li a.revert:active, -#dokuwiki__pagetools ul li a.revert:focus, -.mode_revert #dokuwiki__pagetools ul li a.revert { - background-position: left -495px; -} - -#dokuwiki__pagetools ul li a.subscribe { - background-position: left -720px; -} -#dokuwiki__pagetools ul li a.subscribe:hover, -#dokuwiki__pagetools ul li a.subscribe:active, -#dokuwiki__pagetools ul li a.subscribe:focus, -.mode_subscribe #dokuwiki__pagetools ul li a.subscribe { - background-position: left -765px; -} - -#dokuwiki__pagetools ul li a.mediaManager { - background-position: left -900px; -} -#dokuwiki__pagetools ul li a.mediaManager:hover, -#dokuwiki__pagetools ul li a.mediaManager:active, -#dokuwiki__pagetools ul li a.mediaManager:focus { - background-position: left -945px; -} - -#dokuwiki__pagetools ul li a.back { - background-position: left -990px; -} -#dokuwiki__pagetools ul li a.back:hover, -#dokuwiki__pagetools ul li a.back:active, -#dokuwiki__pagetools ul li a.back:focus { - background-position: left -1035px; -} - - -/*____________ content ____________*/ - -/* section indenting -.dokuwiki .page h1 {margin-left: 0; margin-right: 0;} -.dokuwiki .page h2 {margin-left: 0; margin-right: .666em;} -.dokuwiki .page h3 {margin-left: 0; margin-right: 1.776em;} -.dokuwiki .page h4 {margin-left: 0; margin-right: 3em;} -.dokuwiki .page h5 {margin-left: 0; margin-right: 4.5712em;} -.dokuwiki .page div.level1 {margin-left: 0; margin-right: 0;} -.dokuwiki .page div.level2 {margin-left: 0; margin-right: 1em;} -.dokuwiki .page div.level3 {margin-left: 0; margin-right: 2em;} -.dokuwiki .page div.level4 {margin-left: 0; margin-right: 3em;} -.dokuwiki .page div.level5 {margin-left: 0; margin-right: 4em;} -*/ - -.dokuwiki dl.code dt, -.dokuwiki dl.file dt { - margin-left: 0; - margin-right: 1em; -} - -.JSpopup ul, -.JSpopup ol { - padding-right: 0; -} - - -/*____________ mobile ____________*/ - -@media only screen and (max-width: 480px), only screen and (max-device-width: 480px) { - - -.hasSidebar #dokuwiki__content, -.hasSidebar #dokuwiki__content .pad { - margin-right: 0; -} - -#dokuwiki__header ul.a11y.skip { - left: auto !important; - right: 0 !important; - float: left; - padding-right: 0; -} -#dokuwiki__header ul.a11y.skip li { - margin: 0 .35em 0 0; -} - -#dokuwiki__header .headings, -#dokuwiki__header .tools { - float: none; - text-align: right; - width: auto; -} -#dokuwiki__sitetools { - text-align: right; -} - -#dokuwiki__sitetools form.search { - float: right; - margin: 0 0 .2em .2em; -} - -#dokuwiki__header .mobileTools { - float: left; -} - -.dokuwiki div.toc { - float: none; - margin: 0 0 1em 0; - border-right-width: 0; -} - -.dokuwiki label.block { - text-align: right; -} - - - -} /* /@media */ diff --git a/css/structure.css b/css/structure.css deleted file mode 100644 index 4e3a14be8..000000000 --- a/css/structure.css +++ /dev/null @@ -1,58 +0,0 @@ -/** - * This file provides styles for the general layout structure. - * - * @author Anika Henke <anika@selfthinker.org> - */ - -body { - margin: 0 auto; -} -#dokuwiki__site { - margin: 0 auto; - max-width: __site_width__; -} -#dokuwiki__site .site { - padding: 0 .5em; -} - -#dokuwiki__header { - width: 100%; -} -#dokuwiki__header .pad { -} - #dokuwiki__header .headings { - float: left; - } - #dokuwiki__header .tools { - float: right; - text-align: right; - } - -#dokuwiki__site .wrapper { - position: relative; -} - - #dokuwiki__aside { - width: __sidebar_width__; - float: left; - position: relative; - display: block; - } - #dokuwiki__aside .pad { - margin: 0 1.5em 0 0; - } - - .hasSidebar #dokuwiki__content { - float: right; - margin-left: -__sidebar_width__; - width: 100%; - } - .hasSidebar #dokuwiki__content .pad { - margin-left: __sidebar_width__; - } - -#dokuwiki__footer { - clear: both; -} -#dokuwiki__footer .pad { -} diff --git a/detail.php b/detail.php deleted file mode 100644 index 287827253..000000000 --- a/detail.php +++ /dev/null @@ -1,144 +0,0 @@ -<?php -/** - * DokuWiki Image Detail Page - * - * @author Andreas Gohr <andi@splitbrain.org> - * @author Anika Henke <anika@selfthinker.org> - * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - */ - -// must be run from within DokuWiki -if (!defined('DOKU_INC')) die(); -@require_once(dirname(__FILE__).'/tpl_functions.php'); /* include hook for template functions */ - -$showSidebar = $conf['sidebar'] && page_exists($conf['sidebar']) && ($ACT=='show'); -?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" - "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php echo $conf['lang']?>" - lang="<?php echo $conf['lang']?>" dir="<?php echo $lang['direction'] ?>"> -<head> - <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> - <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" /> - <title> - <?php echo hsc(tpl_img_getTag('IPTC.Headline',$IMG))?> - [<?php echo strip_tags($conf['title'])?>] - - - - - - - - - - - - - are added to make it possible to e.g. style a page differently if it's in edit mode, - see http://www.dokuwiki.org/devel:action_modes for a list of action modes */ ?> - -
      - - - -
      - - -
      - - -
      - - -
      - - - - '.$ERROR.'

    '; - else: ?> - -

    - - - -
    -
    - $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/images/apple-touch-icon.png b/images/apple-touch-icon.png deleted file mode 100644 index 45fa4e7b0..000000000 Binary files a/images/apple-touch-icon.png and /dev/null differ diff --git a/images/bullet.png b/images/bullet.png deleted file mode 100644 index 5da537443..000000000 Binary files a/images/bullet.png and /dev/null differ diff --git a/images/closed.png b/images/closed.png deleted file mode 100644 index 3691ebc17..000000000 Binary files a/images/closed.png and /dev/null differ diff --git a/images/favicon.ico b/images/favicon.ico deleted file mode 100644 index 8b9616abb..000000000 Binary files a/images/favicon.ico and /dev/null differ diff --git a/images/link_icon.gif b/images/link_icon.gif deleted file mode 100644 index 815ccb1b1..000000000 Binary files a/images/link_icon.gif and /dev/null differ diff --git a/images/logo.png b/images/logo.png deleted file mode 100644 index 8b794dd64..000000000 Binary files a/images/logo.png and /dev/null differ diff --git a/images/mail_icon.gif b/images/mail_icon.gif deleted file mode 100644 index 50a87a9a0..000000000 Binary files a/images/mail_icon.gif and /dev/null differ diff --git a/images/open.png b/images/open.png deleted file mode 100644 index 40ff129be..000000000 Binary files a/images/open.png and /dev/null differ diff --git a/images/pagetools-license.txt b/images/pagetools-license.txt deleted file mode 100644 index 299624c62..000000000 --- a/images/pagetools-license.txt +++ /dev/null @@ -1,4 +0,0 @@ -Icon set: iPhone toolbar icons -Designer: TheWorkingGroup.ca -License: Creative Commons Attribution-Share Alike License [http://creativecommons.org/licenses/by-sa/3.0/] -URL: http://blog.twg.ca/2009/09/free-iphone-toolbar-icons/ diff --git a/images/pagetools-sprite.png b/images/pagetools-sprite.png deleted file mode 100644 index a0f4036ff..000000000 Binary files a/images/pagetools-sprite.png and /dev/null differ diff --git a/images/pagetools-sprite.xcf b/images/pagetools-sprite.xcf deleted file mode 100644 index 07c1d83fb..000000000 Binary files a/images/pagetools-sprite.xcf and /dev/null differ diff --git a/images/pagetools.xcf b/images/pagetools.xcf deleted file mode 100644 index 034b39a42..000000000 Binary files a/images/pagetools.xcf and /dev/null differ diff --git a/images/resizecol.png b/images/resizecol.png deleted file mode 100644 index f0111507c..000000000 Binary files a/images/resizecol.png and /dev/null differ diff --git a/images/search.png b/images/search.png deleted file mode 100644 index 2adfc7357..000000000 Binary files a/images/search.png and /dev/null differ diff --git a/images/toc-arrows.png b/images/toc-arrows.png deleted file mode 100644 index 9f441eb26..000000000 Binary files a/images/toc-arrows.png and /dev/null differ diff --git a/images/toc-bullet.png b/images/toc-bullet.png deleted file mode 100644 index a6f0169c3..000000000 Binary files a/images/toc-bullet.png and /dev/null differ diff --git a/images/windows.gif b/images/windows.gif deleted file mode 100644 index 4f12acce1..000000000 Binary files a/images/windows.gif and /dev/null differ diff --git a/lib/tpl/dokuwiki/README b/lib/tpl/dokuwiki/README new file mode 100644 index 000000000..966fc45f1 --- /dev/null +++ b/lib/tpl/dokuwiki/README @@ -0,0 +1,5 @@ +Starter Template for DokuWiki +http://www.dokuwiki.org/template:starter + +version: 2011-02-20 +author: Anika Henke diff --git a/lib/tpl/dokuwiki/css/_admin.css b/lib/tpl/dokuwiki/css/_admin.css new file mode 100644 index 000000000..e4664367c --- /dev/null +++ b/lib/tpl/dokuwiki/css/_admin.css @@ -0,0 +1,47 @@ +/** + * 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; +} + +.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; +} + +.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; +} diff --git a/lib/tpl/dokuwiki/css/_diff.css b/lib/tpl/dokuwiki/css/_diff.css new file mode 100644 index 000000000..62f831213 --- /dev/null +++ b/lib/tpl/dokuwiki/css/_diff.css @@ -0,0 +1,65 @@ +/** + * 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/lib/tpl/dokuwiki/css/_edit.css b/lib/tpl/dokuwiki/css/_edit.css new file mode 100644 index 000000000..5a3952c90 --- /dev/null +++ b/lib/tpl/dokuwiki/css/_edit.css @@ -0,0 +1,128 @@ +/** + * This file provides styles for the edit view (?do=edit), preview + * and section edit buttons. + */ + +/* edit view +********************************************************************/ + +/*____________ toolbar ____________*/ + +.dokuwiki div.toolbar { + margin-bottom: .5em; + overflow: hidden; +} +.dokuwiki div.toolbar #draft__status { + float: right; + color: __text_alt__; + background-color: inherit; +} +.dokuwiki div.toolbar #tool__bar { + float: left; +} + +/* 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 { + overflow: hidden; + margin-bottom: .5em; +} + +/* size and wrap controls */ +.dokuwiki #wiki__editbar #size__ctl { + float: right; +} +.dokuwiki #wiki__editbar #size__ctl img { + cursor: pointer; +} + +/* edit buttons */ +.dokuwiki #wiki__editbar .editButtons { + display: inline; + margin-right: 1em; +} +.dokuwiki #wiki__editbar .editButtons input { +} + +/* summary input and minor changes checkbox */ +.dokuwiki #wiki__editbar .summary { + display: inline; +} +.dokuwiki #wiki__editbar .summary label { + vertical-align: middle; + white-space: nowrap; +} +.dokuwiki #wiki__editbar .summary label span { + vertical-align: middle; +} +.dokuwiki #wiki__editbar .summary input { +} +/* change background colour if summary is missing */ +.dokuwiki #wiki__editbar .summary input.missing { + 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; +} +.dokuwiki .secedit input.button { + font-size: 75%; +} + +/* generic style for section highlighting (including headings) */ +.dokuwiki .section_highlight { +} +/* style for section highlighting (only sections below headings) */ +.dokuwiki div.section_highlight { + margin: -3em -1em -.01em -1em; /* negative side margin = side padding + side border */ + padding: 3em .5em .01em .5em; + border: solid __background_alt__; + border-width: 0 .5em; +} diff --git a/lib/tpl/dokuwiki/css/_fileuploader.css b/lib/tpl/dokuwiki/css/_fileuploader.css new file mode 100644 index 000000000..42004de28 --- /dev/null +++ b/lib/tpl/dokuwiki/css/_fileuploader.css @@ -0,0 +1,112 @@ +/** + * 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 */ + +.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/lib/tpl/dokuwiki/css/_footnotes.css b/lib/tpl/dokuwiki/css/_footnotes.css new file mode 100644 index 000000000..a20f2964e --- /dev/null +++ b/lib/tpl/dokuwiki/css/_footnotes.css @@ -0,0 +1,28 @@ +/** + * 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/lib/tpl/dokuwiki/css/_forms.css b/lib/tpl/dokuwiki/css/_forms.css new file mode 100644 index 000000000..804584725 --- /dev/null +++ b/lib/tpl/dokuwiki/css/_forms.css @@ -0,0 +1,82 @@ + +/* TODO */ + +/** + * 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; +} + +.dokuwiki label.simple { + display: block; + text-align: left; + font-weight: normal; +} + +.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 + */ + +form#subscribe__form { + display: block; + width: 400px; + 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/dokuwiki/css/_imgdetail.css b/lib/tpl/dokuwiki/css/_imgdetail.css new file mode 100644 index 000000000..a3e0f55f5 --- /dev/null +++ b/lib/tpl/dokuwiki/css/_imgdetail.css @@ -0,0 +1,30 @@ +/** + * 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; +} +#dokuwiki__detail div.img_detail { + float: left; +} + +#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/lib/tpl/dokuwiki/css/_links.css b/lib/tpl/dokuwiki/css/_links.css new file mode 100644 index 000000000..6b19c3a24 --- /dev/null +++ b/lib/tpl/dokuwiki/css/_links.css @@ -0,0 +1,65 @@ +/** + * This file provides styles for all types of links. + */ + +/*____________ links to wiki pages ____________*/ + +/* existing wikipage */ +.dokuwiki a.wikilink1 { + color: __existing__; + background-color: inherit; +} +/* not existing wikipage */ +.dokuwiki a.wikilink2 { + color: __missing__; + background-color: inherit; + 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 20px; +} +/* external link */ +.dokuwiki a.urlextern { + background-image: url(images/link_icon.gif); + padding: 0 0 0 17px; +} +/* windows share */ +.dokuwiki a.windows { + background-image: url(images/windows.gif); +} +/* email link */ +.dokuwiki a.mail { + background-image: url(images/mail_icon.gif); +} + +/* 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 { + padding: 0 0 0 17px; +} diff --git a/lib/tpl/dokuwiki/css/_media_fullscreen.css b/lib/tpl/dokuwiki/css/_media_fullscreen.css new file mode 100644 index 000000000..3bf48e9ec --- /dev/null +++ b/lib/tpl/dokuwiki/css/_media_fullscreen.css @@ -0,0 +1,457 @@ +/** + * 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; +} + +#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__; +} + + +#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 ____________*/ + +#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.4em; +} +* html #mediamanager__page .namespaces h2, +*+html #mediamanager__page .namespaces h2 { + display: inline; +} + +#mediamanager__page .namespaces ul { + margin-left: .2em; + margin-bottom: 0; + padding: 0; + list-style: none; +} +#mediamanager__page .namespaces ul ul { + margin-left: 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; +} + +#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: .3em .5em; + line-height: 1; +} + +/* file list content */ + +#mediamanager__page .filelist ul { + padding: 0; + margin: 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; +} +* 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 { + margin-left: 10px; + padding: 0; + list-style-type: none; +} + +#mediamanager__page #page__revisions ul li div.li div { + font-size: 90%; + color: __text_neu__; + padding-left: 18px; +} + +#mediamanager__page #page__revisions ul li div.li input { + 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__; +} + +#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 .image1, +#mediamanager__diff .imageDiff .image2 { + width: 97%; +} +#mediamanager__diff .imageDiff .image2 { + position: absolute; + top: 0; + left: 0; +} + +#mediamanager__diff .imageDiff.opacity .image2 { + opacity: 0.5; +} + +#mediamanager__diff .imageDiff.portions .image2 { + border-right: 1px solid red; + overflow: hidden; +} + +#mediamanager__diff .imageDiff img { + width: 100%; +} + diff --git a/lib/tpl/dokuwiki/css/_media_popup.css b/lib/tpl/dokuwiki/css/_media_popup.css new file mode 100644 index 000000000..0469c8e60 --- /dev/null +++ b/lib/tpl/dokuwiki/css/_media_popup.css @@ -0,0 +1,205 @@ +/** + * 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__; +} +#mediamgr__aside .pad { + padding: .5em; +} + +#mediamgr__content { + width: 69.7%; + height: 100%; + overflow: auto; + position: absolute; + right: 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; +} +#media__opts label { +} + +/*____________ tree ____________*/ + +#media__tree ul { + padding-left: .2em; +} +#media__tree ul li { + clear: left; + list-style-type: none; + list-style-image: none; + margin-left: 0; +} +#media__tree ul li img { + float: left; + padding: .5em .3em 0 0; +} +#media__tree ul li div.li { + display: inline; +} +#media__tree ul li li { + margin-left: 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; +} +#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; +} +#media__content div.detail div.thumb a { + display: block; + cursor: pointer; +} +#media__content div.detail p { + margin-bottom: 0; +} + + +/*____________ media search ____________*/ + +form#dw__mediasearch { +} +form#dw__mediasearch p { +} +form#dw__mediasearch label { +} +form#dw__mediasearch label span { +} +form#dw__mediasearch input.edit { +} +form#dw__mediasearch input.button { +} + + +/* meta edit form +********************************************************************/ + +#media__content form.meta { +} + +#media__content form.meta div.metafield { + clear: left; + margin-bottom: .5em; + overflow: hidden; +} + +#media__content form.meta label { + display: block; + width: 25%; + float: left; + font-weight: bold; + clear: left; +} +#media__content form.meta .edit { + float: left; + width: 70%; + margin: 0; +} +#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%; +} diff --git a/lib/tpl/dokuwiki/css/_mediamanager.css b/lib/tpl/dokuwiki/css/_mediamanager.css new file mode 100644 index 000000000..d47e581ff --- /dev/null +++ b/lib/tpl/dokuwiki/css/_mediamanager.css @@ -0,0 +1,219 @@ +/** + * This file provides styles for the media manager + * (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__; +} +#mediamgr__aside .pad { + padding: .5em; +} + +#mediamgr__content { + width: 69.7%; + height: 100%; + overflow: auto; + position: absolute; + right: 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; +} +#media__opts label { +} + +/*____________ tree ____________*/ + +#media__tree ul { + padding-left: .2em; +} +#media__tree ul li { + clear: left; + list-style-type: none; + list-style-image: none; + margin-left: 0; +} +#media__tree ul li img { + float: left; + padding: .5em .3em 0 0; +} +#media__tree ul li div.li { + display: inline; +} +#media__tree ul li li { + margin-left: 1.5em; +} + +/* right side +********************************************************************/ + +/*____________ upload form ____________*/ + +/* upload info */ +#media__content div.upload { + font-size: .9em; + margin-bottom: .5em; +} + +#media__content form#dw__upload, +#media__content div#dw__flashupload { + display: block; + border-bottom: solid 1px __border__; + padding-bottom: 1em; + margin-bottom: 1em; +} +#media__content form#dw__upload p { + margin-bottom: .5em; +} + +#media__content form#dw__upload label { +} +#media__content form#dw__upload label.check { +} +#media__content form#dw__upload input.check { +} +#media__content form#dw__upload input.edit { +} +#media__content form#dw__upload img { +} + +/*____________ 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; +} +#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; +} +#media__content div.detail div.thumb a { + display: block; +} +#media__content div.detail p { + margin-bottom: 0; +} + + +/*____________ media search ____________*/ + +form#dw__mediasearch { +} +form#dw__mediasearch p { +} +form#dw__mediasearch label { +} +form#dw__mediasearch label span { +} +form#dw__mediasearch input.edit { +} +form#dw__mediasearch input.button { +} + + +/* meta edit form +********************************************************************/ + +#media__content form.meta { +} + +#media__content form.meta div.metafield { + clear: left; + margin-bottom: .5em; + overflow: hidden; +} + +#media__content form.meta label { + display: block; + width: 25%; + float: left; + font-weight: bold; + clear: left; +} +#media__content form.meta .edit { + float: left; + width: 70%; + margin: 0; +} +#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%; +} diff --git a/lib/tpl/dokuwiki/css/_modal.css b/lib/tpl/dokuwiki/css/_modal.css new file mode 100644 index 000000000..125f702a8 --- /dev/null +++ b/lib/tpl/dokuwiki/css/_modal.css @@ -0,0 +1,83 @@ +/** + * 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; +} + +#link__wiz_result div { + padding: 3px 3px 3px 0; +} + +#link__wiz_result div a { + display: block; + padding-left: 22px; + min-height: 16px; + background: transparent 3px center no-repeat; +} + +#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; +} + + +/* 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; +} + +#media__popup_content .button { + margin-right: 1px; + cursor: pointer; +} diff --git a/lib/tpl/dokuwiki/css/_recent.css b/lib/tpl/dokuwiki/css/_recent.css new file mode 100644 index 000000000..68f0e5826 --- /dev/null +++ b/lib/tpl/dokuwiki/css/_recent.css @@ -0,0 +1,69 @@ +/** + * 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 */ +.dokuwiki #dw__recent label { + margin-bottom: .5em; + display: block; +} + +.dokuwiki #dw__recent ul li, +.dokuwiki #page__revisions ul li { + list-style: none; + margin-left: 0; +} +.dokuwiki #dw__recent ul li span, +.dokuwiki #dw__recent ul li a, +.dokuwiki #page__revisions ul li span, +.dokuwiki #page__revisions ul li a { + vertical-align: middle; +} +.dokuwiki #dw__recent ul li span.user a, +.dokuwiki #page__revisions ul li span.user a { + vertical-align: bottom; +} +.dokuwiki #dw__recent ul li.minor, +.dokuwiki #page__revisions ul li.minor { + opacity: .7; +} + +.dokuwiki #dw__recent li span.date, +.dokuwiki #page__revisions li span.date { +} +.dokuwiki #dw__recent li a.diff_link, +.dokuwiki #page__revisions li a.diff_link { + vertical-align: baseline; +} +.dokuwiki #dw__recent li a.revisions_link, +.dokuwiki #page__revisions li a.revisions_link { + vertical-align: baseline; +} +.dokuwiki #dw__recent li a.wikilink1, +.dokuwiki #dw__recent li a.wikilink2, +.dokuwiki #page__revisions li a.wikilink1, +.dokuwiki #page__revisions li a.wikilink2 { +} +.dokuwiki #dw__recent li span.sum, +.dokuwiki #page__revisions li span.sum { + font-weight: bold; +} +.dokuwiki #dw__recent li span.user, +.dokuwiki #page__revisions li span.user { +} + + +/*____________ 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/lib/tpl/dokuwiki/css/_search.css b/lib/tpl/dokuwiki/css/_search.css new file mode 100644 index 000000000..70824fc43 --- /dev/null +++ b/lib/tpl/dokuwiki/css/_search.css @@ -0,0 +1,93 @@ +/** + * This file provides styles for the search results page (?do=search) + * and the AJAX search popup. + */ + +/* search results page +********************************************************************/ + +/* loading gif */ +.dokuwiki #dw__loading { +} + +/*____________ 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; +} + +/*____________ search results ____________*/ + +/* container for one search result */ +.dokuwiki div.search_result { + margin-bottom: 1.4em; +} +/* search snippet */ +.dokuwiki div.search_result div.search_snippet { + color: __text_alt__; + background-color: inherit; +} + +/* 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 { + font-weight: normal; +} +/* ellipsis separating snippets */ +.dokuwiki div.search_result .search_sep { + 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; +} + +/* .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; +} +.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/lib/tpl/dokuwiki/css/_tabs.css b/lib/tpl/dokuwiki/css/_tabs.css new file mode 100644 index 000000000..de544fd2b --- /dev/null +++ b/lib/tpl/dokuwiki/css/_tabs.css @@ -0,0 +1,40 @@ +/** + * This file provides the styles for general tabs. + */ + +.dokuwiki ul.tabs { + padding: 0; + margin: 0; + overflow: hidden; +} +.dokuwiki ul.tabs li { + float: left; + padding: 0; + margin: 0; + list-style: none; +} + +.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; +} +.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/dokuwiki/css/_toc.css b/lib/tpl/dokuwiki/css/_toc.css new file mode 100644 index 000000000..b78817523 --- /dev/null +++ b/lib/tpl/dokuwiki/css/_toc.css @@ -0,0 +1,77 @@ +/** + * This file provides styles for the TOC (table of contents), the + * sitemap (?do=index) and backlinks (?do=backlink). + */ + +/* toc +********************************************************************/ + +/* toc container */ +.dokuwiki div.toc { + float: right; + margin: 0 0 1.4em 1.4em; + width: 12em; + background-color: __background_alt__; + color: inherit; +} + +/*____________ toc header ____________*/ + +.dokuwiki div.tocheader { + padding: .2em .5em; + font-weight: bold; +} + +.dokuwiki .toc span.toc_open, +.dokuwiki .toc span.toc_close { + float: right; + margin: 0 .2em; +} + +/*____________ toc list ____________*/ + +.dokuwiki #toc__inside { + padding: .2em .5em; +} +.dokuwiki #toc__inside ul { + padding: 0; + margin: 0; +} +.dokuwiki #toc__inside ul li { + list-style: none; + padding: 0; + margin: 0; + line-height: 1.1; +} +.dokuwiki #toc__inside ul li div.li { + padding: .15em 0; +} +.dokuwiki #toc__inside ul ul { + padding-left: 1em; +} +.dokuwiki #toc__inside ul ul li { +} +.dokuwiki #toc__inside ul li a { +} + +/* 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 { +} + + +/* sitemap (and backlinks) +********************************************************************/ + +.dokuwiki ul.idx { + padding-left: 0; +} +.dokuwiki ul.idx li { + list-style-image: url(images/bullet.png); +} +.dokuwiki ul.idx li.open { + list-style-image: url(images/open.png); +} +.dokuwiki ul.idx li.closed { + list-style-image: url(images/closed.png); +} diff --git a/lib/tpl/dokuwiki/css/basic.css b/lib/tpl/dokuwiki/css/basic.css new file mode 100644 index 000000000..ae9be499e --- /dev/null +++ b/lib/tpl/dokuwiki/css/basic.css @@ -0,0 +1,381 @@ +/** + * This file provides the most basic styles. + * + * If you integrate DokuWiki into another project, you might either + * want to integrate this file into the other project as well, or use + * the other project's basic CSS for DokuWiki instead of this one. + * + * @author Anika Henke + */ + +html { + overflow-x: auto; + overflow-y: scroll; +} +html, +body { + color: __text__; + background-color: __background_site__; + background-image: -moz-linear-gradient( top, __background_neu__ 0%, __background_alt__ 1em, __background_site__ 4em); + background-image: -webkit-linear-gradient(top, __background_neu__ 0%, __background_alt__ 1em, __background_site__ 4em); + background-image: -o-linear-gradient( top, __background_neu__ 0%, __background_alt__ 1em, __background_site__ 4em); + background-image: -ms-linear-gradient( top, __background_neu__ 0%, __background_alt__ 1em, __background_site__ 4em); + background-image: linear-gradient( top, __background_neu__ 0%, __background_alt__ 1em, __background_site__ 4em); + background-size: 1px 10em; + background-repeat: repeat-x; + margin: 0; + padding: 0; +} +body { + font: normal 87.5%/1.4 Arial, sans-serif; + /* default font size: 100% => 16px; 93.75% => 15px; 87.5% => 14px; 81.25% => 13px; 75% => 12px */ +} + + +/*____________ headers ____________*/ + +h1, +h2, +h3, +h4, +h5, +h6, +caption, +legend { + font-family: Arial, sans-serif; + font-weight: bold; + background-color: inherit; + padding: 0; + line-height: 1.2; + clear: left; /* ideally 'both', but problems with toc */ +} + +h1 { + font-size: 2em; + margin: -.222em 0 0.444em; +} +h2 { + font-size: 1.5em; + margin: 0 0 0.666em; +} +h3 { + font-size: 1.125em; + margin: 0 0 0.888em; +} +h4 { + font-size: 1em; + margin: 0 0 1.0em; +} +h5 { + font-size: .875em; + margin: 0 0 1.1428em; +} +h6 { + font-size: .75em; + margin: 0 0 1.333em; +} +/* bottom margin = 1 / font-size */ + + +/*____________ basic margins and paddings ____________*/ + +p, +ul, +ol, +dl, +pre, +table, +hr, +blockquote, +fieldset, +address { + margin: 0 0 1.4em 0; /* bottom margin = line-height */ + padding: 0; +} + +div { + margin: 0; + padding: 0; +} + + +/*____________ lists ____________*/ + +ul, +ol { + padding: 0 0 0 1.5em; +} +li, +dd { + padding: 0; + margin: 0 0 0 1.5em; +} +dt { + font-weight: bold; + margin: 0; + padding: 0; +} + +li ul, +li ol, +li dl, +dl ul, +dl ol, +dl dl { + margin-bottom: 0; + padding: 0; +} +li li { + font-size: 100%; +} + +ul { list-style: square outside; } +ol { list-style: decimal outside; } +ol ol { list-style-type: lower-alpha; } +ol ol ol { list-style-type: upper-roman; } +ol ol ol ol { list-style-type: upper-alpha; } +ol ol ol ol ol { list-style-type: lower-roman; } + + +/*____________ tables ____________*/ + +table { + border-collapse: collapse; + empty-cells: show; + border-spacing: 0; + border: 1px solid __border__; +} + +caption { + caption-side: top; + text-align: left; + margin: 0 0 .3em; +} + +th, +td { + padding: .3em .5em; + margin: 0; + vertical-align: top; + border: 1px solid __border__; + text-align: left; +} +th { + font-weight: bold; + background-color: __background_alt__; +} + + +/*____________ links ____________*/ + +a { + outline: none; +} +a:link, +a:visited { + text-decoration: none; + color: __link__; +} +a:link:hover, +a:visited:hover, +a:link:focus, +a:visited:focus, +a:link:active, +a:visited:active { + text-decoration: underline; +} + + +/*____________ misc ____________*/ + +img { + border-width: 0; + vertical-align: middle; + color: #666; + background-color: transparent; + font-style: italic; +} +img, +object { + max-width: 100%; +} + +hr { + border-top: solid __border__; + border-bottom: solid __background__; + border-width: 1px 0; + height: 0; + width: 100%; + text-align: center; + clear: both; +} + +acronym, +abbr { + cursor: help; + border-bottom: 1px dotted; + font-style: normal; +} + +pre, +code, +samp, +kbd { + font-family: Consolas, "Andale Mono WT", "Andale Mono", "Bitstream Vera Sans Mono", "Nimbus Mono L", Monaco, "Courier New", monospace; + /* same font stack should be used for ".dokuwiki table.diff td" in _diff.css */ + font-size: 1em; + direction: ltr; + text-align: left; +} +pre { + overflow: auto; + word-wrap: normal; +} + +blockquote { + padding: 0 .5em; + border: solid __border__; + border-width: 0 0 0 .25em; +} +q:before, +q:after { + content: ''; +} + +sub, +sup { + font-size: .8em; + line-height: 1; +} +sub { + vertical-align: sub; +} +sup { + vertical-align: super; +} + +/*____________ forms ____________*/ + +/* for all of the form styles, style.ini colours are not used on purpose (except for fieldset border) */ + +form { + display: inline; + margin: 0; + padding: 0; +} +fieldset { + padding: 1em 1em 0; + border: 1px solid __text_alt__; +} +legend { + margin: 0; + padding: 0 .1em; +} +label { + vertical-align: middle; + cursor: pointer; +} + +input, +textarea, +button, +select, +optgroup, +option { + font: inherit; + font-weight: normal; + color: #333; + background-color: #fff; + line-height: 1; + margin: 0; + vertical-align: middle; + -moz-box-sizing: border-box; + -webkit-box-sizing: border-box; + box-sizing: border-box; +} + +optgroup { + font-style: italic; + font-weight: bold; +} +option { + font-style: normal; + font-weight: normal; +} + +input, +textarea, +select { + border: 1px solid #ccc; + box-shadow: inset 0 0 1px #eee; + border-radius: 2px; +} +input:active, +input:focus, +textarea:active, +textarea:focus, +select:active, +select:focus { + border-color: #999; +} +input[type=radio], +input[type=checkbox] { + padding: 0; + border-width: 0; + box-shadow: none; +} + +/* all types of buttons */ +input[type=submit], +input.button, +a.button, +button, +.qq-upload-button { + color: #333; + background-color: #eee; + background: -moz-linear-gradient( top, #ffffff 0%, #f4f4f4 30%, #eeeeee 99%, #cccccc 99%); + background: -webkit-linear-gradient(top, #ffffff 0%, #f4f4f4 30%, #eeeeee 99%, #cccccc 99%); + background: -o-linear-gradient( top, #ffffff 0%, #f4f4f4 30%, #eeeeee 99%, #cccccc 99%); + background: -ms-linear-gradient( top, #ffffff 0%, #f4f4f4 30%, #eeeeee 99%, #cccccc 99%); + background: linear-gradient( top, #ffffff 0%, #f4f4f4 30%, #eeeeee 99%, #cccccc 99%); + border: 1px solid #ccc; + border-radius: 2px; + padding: .1em .5em; + cursor: pointer; +} + +input[type=submit]:hover, +input[type=submit]:active, +input[type=submit]:focus, +input.button:hover, +input.button:active, +input.button:focus, +a.button:hover, +a.button:active, +a.button:focus, +button:hover, +button:active, +button:focus, +.qq-upload-button:hover { + border-color: #999; + background-color: #ddd; + background: -moz-linear-gradient( top, #ffffff 0%, #f4f4f4 30%, #dddddd 99%, #cccccc 99%); + background: -webkit-linear-gradient(top, #ffffff 0%, #f4f4f4 30%, #dddddd 99%, #bbbbbb 99%); + background: -o-linear-gradient( top, #ffffff 0%, #f4f4f4 30%, #dddddd 99%, #cccccc 99%); + background: -ms-linear-gradient( top, #ffffff 0%, #f4f4f4 30%, #dddddd 99%, #cccccc 99%); + background: linear-gradient( top, #ffffff 0%, #f4f4f4 30%, #dddddd 99%, #bbbbbb 99%); +} + +input::-moz-focus-inner, +button::-moz-focus-inner { + border: 0; + padding: 0; +} + +input[disabled], +button[disabled], +input[readonly], +button[readonly] { + cursor: auto; +} + diff --git a/lib/tpl/dokuwiki/css/content.css b/lib/tpl/dokuwiki/css/content.css new file mode 100644 index 000000000..4e9f8cbe1 --- /dev/null +++ b/lib/tpl/dokuwiki/css/content.css @@ -0,0 +1,148 @@ +/** + * This file provides the main design styles for the page content. + * + * @author Anika Henke + * @author Andreas Gohr + * @author Clarence Lee + */ + + +/*____________ section indenting ____________ + +.dokuwiki.page h1 {margin-left: 0;} +.dokuwiki.page h2 {margin-left: .666em;} +.dokuwiki.page h3 {margin-left: 1.776em;} +.dokuwiki.page h4 {margin-left: 3em;} +.dokuwiki.page h5 {margin-left: 4.5712em;} +.dokuwiki.page div.level1 {margin-left: 0;} +.dokuwiki.page div.level2 {margin-left: 1em;} +.dokuwiki.page div.level3 {margin-left: 2em;} +.dokuwiki.page div.level4 {margin-left: 3em;} +.dokuwiki.page div.level5 {margin-left: 4em;} +*/ +/* hx margin-left = (1 / font-size) * .levelx-margin */ + + +/*____________ images ____________*/ + +/* embedded images (styles are already partly set in lib/styles/all.css) */ +.dokuwiki img.media { +} +.dokuwiki img.medialeft { + margin: .5em 1.5em .5em 0; +} +.dokuwiki img.mediaright { + margin: .5em 0 .5em 1.5em; +} +.dokuwiki img.mediacenter { + margin: .5em auto; +} + + +/*____________ lists ____________*/ + +.dokuwiki #dokuwiki__content ul li, +.dokuwiki #dokuwiki__aside ul li { + color: __text_alt__; +} +.dokuwiki #dokuwiki__content ol li, +.dokuwiki #dokuwiki__aside ol li { + color: __text_neu__; +} +.dokuwiki #dokuwiki__content li .li, +.dokuwiki #dokuwiki__aside li .li { + color: __text__; +} + + +/*____________ tables ____________*/ + +.dokuwiki div.table { + width: 100%; + overflow-x: auto; + margin-bottom: 1.4em; +} +.dokuwiki div.table table { + margin-bottom: 0; +} + +.dokuwiki table.inline { + min-width: 50%; + border-width: 0; +} +.dokuwiki table.inline th, +.dokuwiki table.inline td { + border: 1px solid __border__; +} +.dokuwiki table.inline th { + color: inherit; + background-color: __background_alt__; +} +.dokuwiki table.inline td { +} +.dokuwiki table.inline tr:hover td { + background-color: __background_alt__; +} +.dokuwiki table.inline tr:hover th { + background-color: __border__; +} + + +/*____________ code ____________*/ + +.dokuwiki pre, +.dokuwiki tt, +.dokuwiki code, +.dokuwiki samp, +.dokuwiki kbd { + background-color: __background_alt__; + color: __text__; +} +/* fix if background-color hides underlining */ +.dokuwiki em.u code { + text-decoration: underline; +} +.dokuwiki pre { + border: 1px solid __border__; + padding: .75em 1em; +} +/* for code in */ +.dokuwiki pre.file { +} + +/* filenames for downloadable file and code blocks */ +.dokuwiki dl.code, +.dokuwiki dl.file { +} + +.dokuwiki dl.code dt, +.dokuwiki dl.file dt { + background-color: __background_alt__; + background: -moz-linear-gradient( top, __background__ 0%, __background_alt__ 100%); + background: -webkit-linear-gradient(top, __background__ 0%, __background_alt__ 100%); + background: -o-linear-gradient( top, __background__ 0%, __background_alt__ 100%); + background: -ms-linear-gradient( top, __background__ 0%, __background_alt__ 100%); + background: linear-gradient( top, __background__ 0%, __background_alt__ 100%); + color: inherit; + border: 1px solid __border__; + border-bottom-color: __background_alt__; + border-top-left-radius: .3em; + border-top-right-radius: .3em; + padding: .3em .6em .1em; + margin-bottom: -1px; + float: left; +} +.dokuwiki dl.code dt a, +.dokuwiki dl.file dt a { + background-color: transparent; + font-size: 0.875em; + font-weight: normal; + display: block; + min-height: 16px; +} +.dokuwiki dl.code dd, +.dokuwiki dl.file dd { + margin: 0; + clear: left; +} + diff --git a/lib/tpl/dokuwiki/css/design.css b/lib/tpl/dokuwiki/css/design.css new file mode 100644 index 000000000..39d793f99 --- /dev/null +++ b/lib/tpl/dokuwiki/css/design.css @@ -0,0 +1,463 @@ +/** + * This file provides the main design styles for the + * bits that surround the content. + * + * @author Anika Henke + * @author Andreas Gohr + * @author Clarence Lee + */ + +/* header +********************************************************************/ + +#dokuwiki__header { + padding: 2em 0 1.5em; +} + +#dokuwiki__header .headings, +#dokuwiki__header .tools { + margin-bottom: 1.5em; + width: 49%; +} +#dokuwiki__header h1 img { + float: left; + margin-right: .5em; +} +#dokuwiki__header h1 span { + display: block; + padding-top: 10px; +} +#dokuwiki__header h1 { + margin: 0; + font-size: 1.5em; + font-weight: normal; +} +#dokuwiki__header h1 a { + text-decoration: none; + color: __text__; + background-color: inherit; +} +#dokuwiki__header h1 a:hover, +#dokuwiki__header h1 a:active, +#dokuwiki__header h1 a:focus { +} +#dokuwiki__header p.claim { + margin-bottom: 0; + font-size: 0.875em; +} + +#dokuwiki__header .tools { + margin-top: .2em; +} + + +/* tools +********************************************************************/ + +/* highlight selected tool */ +.mode_admin a.action.admin, +.mode_login a.action.login, +.mode_register a.action.register, +.mode_profile a.action.profile, +.mode_recent a.action.recent, +.mode_index a.action.index, +.mode_revisions a.action.revs, +.mode_backlink a.action.backlink, +.mode_subscribe a.action.subscribe { + font-weight: bold; +} + +#dokuwiki__header .tools ul { + padding-left: 0; + margin-bottom: 0; +} +#dokuwiki__header .tools li { + font-size: 0.875em; + margin-left: 1em; + list-style: none; + display: inline; +} +#dokuwiki__header .tools form.search div.ajax_qsearch li { + font-size: 1em; + margin-left: 0; + display: block; + overflow: hidden; + text-overflow: ellipsis; +} + +#dokuwiki__header .mobileTools { + display: none; /* hide mobile tools dropdown to only show in mobile view */ +} + +/*____________ user tools ____________*/ + +#dokuwiki__usertools { + position: absolute; + top: .5em; + right: .5em; + text-align: right; + width: 100%; +} +#dokuwiki__usertools ul { + margin: 0 auto; + padding: 0; + max-width: __site_width__; +} +#dokuwiki__usertools ul li.user { +} + + +/*____________ site tools ____________*/ + +#dokuwiki__sitetools { + text-align: right; +} + +#dokuwiki__sitetools form.search { + display: block; + font-size: 0.875em; + position: relative; +} +#dokuwiki__sitetools form.search input.edit { + width: 18em; + padding: .35em 22px .35em .1em; +} +#dokuwiki__sitetools form.search input.button { + background: transparent url(images/search.png) no-repeat 0 0; + border-width: 0; + width: 19px; + height: 14px; + text-indent: -99999px; + margin-left: -20px; + box-shadow: none; + padding: 0; +} + +#dokuwiki__sitetools ul { + margin-top: 0.5em; +} +#dokuwiki__sitetools li { +} + +/*____________ breadcrumbs ____________*/ + +.dokuwiki div.breadcrumbs { + border-top: 1px solid __border__; + border-bottom: 1px solid __background__; + margin-bottom: .5em; + font-size: 0.875em; + clear: both; +} +.dokuwiki div.breadcrumbs div { + padding: .1em .35em; +} + +.dokuwiki div.breadcrumbs div:only-child { + border-top: 1px solid __background__; + border-bottom: 1px solid __border__; +} +.dokuwiki div.breadcrumbs div:first-child { + border-top: 1px solid __background__; +} +#IE7 .dokuwiki div.breadcrumbs div, +#IE8 .dokuwiki div.breadcrumbs div { + border-bottom: 1px solid __border__; +} +.dokuwiki div.breadcrumbs div:last-child { + border-bottom: 1px solid __border__; +} + +.dokuwiki div.breadcrumbs a { + color: __link__; + background-color: inherit; +} +.dokuwiki div.breadcrumbs .bcsep { + font-size: 0.75em; +} + + +/* sidebar +********************************************************************/ + +#dokuwiki__aside { +} +#dokuwiki__aside .pad { + font-size: 0.875em; + overflow: hidden; + word-wrap: break-word; +} + +/* make sidebar more condensed */ + +#dokuwiki__aside h1 { + margin-bottom: .222em; +} +#dokuwiki__aside h2 { + margin-bottom: .333em; +} +#dokuwiki__aside h3 { + margin-bottom: .444em; +} +#dokuwiki__aside h4 { + margin-bottom: .5em; +} +#dokuwiki__aside h5 { + margin-bottom: .5714em; +} + +#dokuwiki__aside p, +#dokuwiki__aside ul, +#dokuwiki__aside ol, +#dokuwiki__aside dl, +#dokuwiki__aside pre, +#dokuwiki__aside table, +#dokuwiki__aside fieldset, +#dokuwiki__aside hr, +#dokuwiki__aside blockquote, +#dokuwiki__aside address { + margin-bottom: .7em; +} + +#dokuwiki__aside ul, +#dokuwiki__aside ol { + padding-left: 0; +} +#dokuwiki__aside li ul, +#dokuwiki__aside li ol { + margin-bottom: 0; +} + +#dokuwiki__aside a:link, +#dokuwiki__aside a:visited { + color: __link__; + background-color: inherit; +} + + +/* content +********************************************************************/ + +#dokuwiki__content { +} + +.dokuwiki .pageId { + position: absolute; + top: -2.3em; + right: -1em; + overflow: hidden; + padding: 1em 1em 0; +} +.dokuwiki .pageId span { + font-size: 0.875em; + border: solid __background_alt__; + border-width: 1px 1px 0; + background-color: __background__; + color: __text_alt__; + padding: .1em .35em; + border-top-left-radius: 2px; + border-top-right-radius: 2px; + box-shadow: 0 0 .5em #999; + display: block; +} + +.dokuwiki div.page { + background: __background__; + color: inherit; + border: 1px solid #eee; + box-shadow: 0 0 .5em #999; + border-radius: 2px; + padding: 2em; + margin-bottom: .5em; + overflow: hidden; + word-wrap: break-word; +} + +.dokuwiki .docInfo { + font-size: 0.875em; + text-align: right; +} + +/*____________ misc ____________*/ + +/* license note under edit window */ +.dokuwiki div.license { + font-size: 93.75%; +} +/* license note in footer */ +.dokuwiki #dokuwiki__footer div.license { + font-size: 100%; +} + +#IE7 .dokuwiki input.button, +#IE7 .dokuwiki button { + line-height: 1.4; +} + +#acl__tree li { + margin: 0; +} + +.dokuwiki #dokuwiki__content span.curid a { + font-weight: normal; +} +.dokuwiki #dokuwiki__content strong span.curid a { + font-weight: bold; +} + + +/*____________ changes to _edit ____________*/ + +.dokuwiki div.toolbar button.toolbutton { + border-radius: 0; + border-left-width: 0; + padding: .1em .35em; +} +.dokuwiki div.toolbar button.toolbutton:first-child { + border-top-left-radius: 4px; + border-bottom-left-radius: 4px; + border-left-width: 1px; +} +.dokuwiki div.toolbar button.toolbutton:last-child { + border-top-right-radius: 4px; + border-bottom-right-radius: 4px; +} + +.dokuwiki div.section_highlight { + margin: -3em -2em -.01em -2em; + padding: 3em 1em .01em 1em; + border-width: 0 1em; +} + +.dokuwiki textarea.edit { + font-family: Consolas, "Andale Mono WT", "Andale Mono", "Bitstream Vera Sans Mono", "Liberation Mono", Monaco, "Courier New", monospace; +} + +.dokuwiki div.preview { + margin: 0 -2em; + padding: 2em; +} + + +/*____________ changes to _toc ____________*/ + +.dokuwiki div.toc { + margin: -2em -2em .5em 1.4em; + width: __sidebar_width__; + border-left: 1px solid __border__; + background: __background__; + color: inherit; +} + +.dokuwiki div.tocheader { + padding: .5em 1em; + margin-bottom: 0; + font-size: .875em; + letter-spacing: .1em; +} + +.dokuwiki .toc span.toc_open, +.dokuwiki .toc span.toc_close { + background: transparent url(images/toc-arrows.png) 0 0; + width: 8px; + height: 5px; + margin: .4em 0 0; +} +.dokuwiki .toc span.toc_open { + background-position: 0 -5px; +} + +.dokuwiki .toc span.toc_open span, +.dokuwiki .toc span.toc_close span { + display: none; +} + + +.dokuwiki #toc__inside { + font-size: 0.875em; + padding: .5em 1em 1em; +} +.dokuwiki #toc__inside ul { + padding: 0 0 0 1.2em; +} +.dokuwiki #toc__inside ul li { + list-style-image: url(images/toc-bullet.png); +} +.dokuwiki #toc__inside ul li.clear { + list-style: none; +} +.dokuwiki #toc__inside ul li div.li { + padding: .2em 0; +} + + +/*____________ changes to _imgdetail ____________*/ + +#dokuwiki__detail { + padding: 0; +} +#dokuwiki__detail img { + float: none; + margin-bottom: 1.4em; +} +#dokuwiki__detail div.img_detail { + float: none; +} + +#dokuwiki__detail div.img_detail dl { + overflow: hidden; +} +#dokuwiki__detail div.img_detail dl dt { + float: left; + width: 9em; + text-align: right; + clear: left; +} +#dokuwiki__detail div.img_detail dl dd { + margin-left: 9.5em; +} + + +/*____________ JS popup ____________*/ + +.JSpopup { + background-color: __background__; + color: __text__; + border: 1px solid __border__; + box-shadow: .1em .1em .1em __border__; + border-radius: 2px; + padding: .3em .5em; + font-size: .9em; +} +.dokuwiki form.search div.ajax_qsearch { + top: -.35em; + font-size: 1em; + text-overflow: ellipsis; +} + +.JSpopup ul, +.JSpopup ol { + padding-left: 0; +} + + +/* footer +********************************************************************/ + +.dokuwiki .wrapper { + margin-bottom: 1.4em; +} + +#dokuwiki__footer { + margin-bottom: 1em; +} +#dokuwiki__footer .pad { + font-size: 0.875em; +} +#dokuwiki__footer div.license { + text-align: center; +} +#dokuwiki__footer .license img { + margin: 0 .5em 0 0; + float: none; +} + diff --git a/lib/tpl/dokuwiki/css/includes.css b/lib/tpl/dokuwiki/css/includes.css new file mode 100644 index 000000000..bc189962f --- /dev/null +++ b/lib/tpl/dokuwiki/css/includes.css @@ -0,0 +1,4 @@ +/** + * This file provides styles for included seperate html files + * (added through "include hooks"). + */ diff --git a/lib/tpl/dokuwiki/css/mobile.css b/lib/tpl/dokuwiki/css/mobile.css new file mode 100644 index 000000000..38242f5be --- /dev/null +++ b/lib/tpl/dokuwiki/css/mobile.css @@ -0,0 +1,192 @@ +/** + * This file provides styles for mobile devices + * and smaller screens (up to 480px and 768px width). + * + * @author Anika Henke + */ + +/* up to 768px screen widths +********************************************************************/ +@media only screen and (max-width: 768px), only screen and (max-device-width: 960px) { + +/* structure */ +#dokuwiki__aside { + width: 100%; + float: none; +} +#dokuwiki__aside .pad { + margin: 0 0 .5em; +} + +.hasSidebar #dokuwiki__content { + float: none; + margin-left: 0; + width: 100%; +} +.hasSidebar #dokuwiki__content .pad { + margin-left: 0; +} + +/* toc */ +.dokuwiki div.toc { + float: none; + margin: 0 0 1em 0; + width: auto; + border-left-width: 0; + border-bottom: 1px solid __border__; +} +.dokuwiki div.tocheader { + padding: 0 0 .5em; +} +.dokuwiki #toc__inside { + padding: .2em 0 .5em; +} + +/* page */ +.dokuwiki div.page { + padding: 1em; +} +.dokuwiki .pageId span { + border-width: 0; + background-color: __background_site__; + color: __text_alt__; + box-shadow: 0 0 0; +} + +/* _edit */ +.dokuwiki div.section_highlight { + margin: -3em -1em -.01em -1em; + padding: 3em .5em .01em .5em; + border-width: 0 .5em; +} +.dokuwiki div.preview { + margin: 0 -1em; + padding: 1em; +} + + +} /* /@media */ + + +/* up to 480px screen widths +********************************************************************/ +@media only screen and (max-width: 480px), only screen and (max-device-width: 960px) { + +/*____________ structure ____________*/ + +#dokuwiki__site { + max-width: 100%; +} +#dokuwiki__site .site { + padding: 0 .5em; +} +#dokuwiki__header { + padding: .5em 0; +} + +/*____________ header ____________*/ + +#dokuwiki__header ul.a11y.skip { + position: static !important; + left: 0 !important; + width: auto !important; + height: auto !important; + float: right; + font-size: 0.875em; + list-style: none; + padding-left: 0; + margin: 0; +} +#dokuwiki__header ul.a11y.skip li { + margin-left: .35em; + display: inline; +} + +#dokuwiki__header .headings, +#dokuwiki__header .tools { + float: none; + text-align: left; + width: auto; + margin-bottom: .5em; +} +#dokuwiki__sitetools { + text-align: left; +} +#dokuwiki__usertools, +#dokuwiki__sitetools ul, +#dokuwiki__sitetools h3, +#dokuwiki__pagetools, +.dokuwiki div.breadcrumbs, /* @todo: maybe move breadcrumbs to the bottom? */ +.dokuwiki .pageId { + display: none; +} + +/* search form */ +#dokuwiki__sitetools form.search { + float: left; + margin: 0 .2em .2em 0; + width: 49%; +} +#dokuwiki__sitetools form.search input.edit { + width: 100% !important; +} +.dokuwiki form.search div.ajax_qsearch { + display: none !important; +} + +/* action dropdown is alternative for all hidden tools */ +#dokuwiki__header .mobileTools { + display: block; + font-size: 0.875em; + margin: 0 0 .2em 0; + float: right; + width: 49%; +} +#dokuwiki__header .mobileTools select { + padding: .3em .1em; + width: 100% !important; +} + + +/*____________ content ____________*/ + +.dokuwiki div.page { + padding: .5em; +} + +/* form elements */ +#config__manager fieldset td.value, +#config__manager td .input, +.dokuwiki fieldset, +.dokuwiki input.edit, +.dokuwiki textarea, +.dokuwiki select { + width: auto !important; + max-width: 100% !important; +} +#config__manager fieldset { + margin-left: 0; + margin-right: 0; +} + +.dokuwiki label.block { + text-align: left; +} +.dokuwiki label.block span { + display: block; +} + +/* _edit */ +.dokuwiki div.section_highlight { + margin: 0; + padding: 0; + border-width: 0; +} +.dokuwiki div.preview { + margin: 0 -.5em; + padding: .5em; +} + + + +} /* /@media */ diff --git a/lib/tpl/dokuwiki/css/pagetools.css b/lib/tpl/dokuwiki/css/pagetools.css new file mode 100644 index 000000000..a25032f0b --- /dev/null +++ b/lib/tpl/dokuwiki/css/pagetools.css @@ -0,0 +1,208 @@ +/** + * This file provides the styles for the page tools + * (fly out navigation beside the page to edit, etc). + * + * @author Anika Henke + * @author Andreas Gohr + */ + +#dokuwiki__site .site { + /* give space to the right so the tools won't disappear on smaller screens */ + /* it's 40px because the 30px wide icons will have 5px more spacing to the left and right */ + padding-right: 40px; + /* give the same space to the left to balance it out */ + padding-left: 40px; +} +.dokuwiki div.page { + min-height: 190px; /* 30 (= height of icons) x 6 (= maximum number of possible tools) + 2x5 */ +} +#dokuwiki__usertools { + /* move the tools just outside of the site */ + right: 40px; +} + + +#dokuwiki__pagetools { + position: absolute; + right: -40px; + /* on same vertical level as first headline, because .page has 2em padding */ + top: 2em; +} + +#dokuwiki__pagetools div.tools { + position: fixed; +} + +#dokuwiki__pagetools ul { + position: absolute; + right: 0; + text-align: right; + margin: 0; + padding: 0; + /* add transparent border to prevent jumping when proper border is added on hover */ + border: 1px solid transparent; +} + +#dokuwiki__pagetools ul li { + padding: 0; + margin: 0; + list-style: none; + font-size: 0.875em; +} + +#dokuwiki__pagetools ul li a { + display: block; + min-height: 20px; /* 30 - 2x5 */ + line-height: 20px; + padding: 5px 40px 5px 5px; + background-image: url(images/pagetools-sprite.png); + background-position: right 0; + background-repeat: no-repeat; + /* add transparent border to prevent jumping when proper border is added on focus */ + border: 1px solid transparent; + white-space: nowrap; +} + +/* hide labels accessibly when neither on hover nor on focus */ +#dokuwiki__pagetools ul li a span { + position: absolute; + left: -99999px; +} + +/* show all tools on hover and individual tools on focus */ +#dokuwiki__pagetools:hover ul, +#dokuwiki__pagetools ul li a:focus { + background-color: __background__; + border-color: __border__; + border-radius: 2px; + box-shadow: 2px 2px 2px __text_alt__; +} + +#dokuwiki__pagetools:hover ul li a span, +#dokuwiki__pagetools ul li a:focus span { + display: inline; + position: static; +} + +#dokuwiki__pagetools ul li a:hover, +#dokuwiki__pagetools ul li a:active, +#dokuwiki__pagetools ul li a:focus { + text-decoration: none; +} +#dokuwiki__pagetools ul li a:hover { + background-color: __background_alt__; +} + +/*____________ all available icons in sprite ____________*/ + +#dokuwiki__pagetools ul li a.edit { + background-position: right 0; +} +#dokuwiki__pagetools ul li a.edit:hover, +#dokuwiki__pagetools ul li a.edit:active, +#dokuwiki__pagetools ul li a.edit:focus { + background-position: right -45px; +} + +#dokuwiki__pagetools ul li a.create { + background-position: right -90px; +} +#dokuwiki__pagetools ul li a.create:hover, +#dokuwiki__pagetools ul li a.create:active, +#dokuwiki__pagetools ul li a.create:focus { + background-position: right -135px; +} + +#dokuwiki__pagetools ul li a.show { + background-position: right -270px; +} +#dokuwiki__pagetools ul li a.show:hover, +#dokuwiki__pagetools ul li a.show:active, +#dokuwiki__pagetools ul li a.show:focus { + background-position: right -315px; +} + +#dokuwiki__pagetools ul li a.source { + background-position: right -360px; +} +#dokuwiki__pagetools ul li a.source:hover, +#dokuwiki__pagetools ul li a.source:active, +#dokuwiki__pagetools ul li a.source:focus { + background-position: right -405px; +} + +#dokuwiki__pagetools ul li a.draft { + background-position: right -180px; +} +#dokuwiki__pagetools ul li a.draft:hover, +#dokuwiki__pagetools ul li a.draft:active, +#dokuwiki__pagetools ul li a.draft:focus { + background-position: right -225px; +} + +#dokuwiki__pagetools ul li a.revs { + background-position: right -540px; +} +#dokuwiki__pagetools ul li a.revs:hover, +#dokuwiki__pagetools ul li a.revs:active, +#dokuwiki__pagetools ul li a.revs:focus, +.mode_revisions #dokuwiki__pagetools ul li a.revs { + background-position: right -585px; +} + +#dokuwiki__pagetools ul li a.backlink { + background-position: right -630px; +} +#dokuwiki__pagetools ul li a.backlink:hover, +#dokuwiki__pagetools ul li a.backlink:active, +#dokuwiki__pagetools ul li a.backlink:focus, +.mode_backlink #dokuwiki__pagetools ul li a.backlink { + background-position: right -675px; +} + +#dokuwiki__pagetools ul li a.top { + background-position: right -810px; +} +#dokuwiki__pagetools ul li a.top:hover, +#dokuwiki__pagetools ul li a.top:active, +#dokuwiki__pagetools ul li a.top:focus { + background-position: right -855px; +} + +#dokuwiki__pagetools ul li a.revert { + background-position: right -450px; +} +#dokuwiki__pagetools ul li a.revert:hover, +#dokuwiki__pagetools ul li a.revert:active, +#dokuwiki__pagetools ul li a.revert:focus, +.mode_revert #dokuwiki__pagetools ul li a.revert { + background-position: right -495px; +} + +#dokuwiki__pagetools ul li a.subscribe { + background-position: right -720px; +} +#dokuwiki__pagetools ul li a.subscribe:hover, +#dokuwiki__pagetools ul li a.subscribe:active, +#dokuwiki__pagetools ul li a.subscribe:focus, +.mode_subscribe #dokuwiki__pagetools ul li a.subscribe { + background-position: right -765px; +} + +#dokuwiki__pagetools ul li a.mediaManager { + background-position: right -900px; +} +#dokuwiki__pagetools ul li a.mediaManager:hover, +#dokuwiki__pagetools ul li a.mediaManager:active, +#dokuwiki__pagetools ul li a.mediaManager:focus { + background-position: right -945px; +} + +#dokuwiki__pagetools ul li a.back { + background-position: right -990px; +} +#dokuwiki__pagetools ul li a.back:hover, +#dokuwiki__pagetools ul li a.back:active, +#dokuwiki__pagetools ul li a.back:focus { + background-position: right -1035px; +} diff --git a/lib/tpl/dokuwiki/css/print.css b/lib/tpl/dokuwiki/css/print.css new file mode 100644 index 000000000..d20d0f464 --- /dev/null +++ b/lib/tpl/dokuwiki/css/print.css @@ -0,0 +1,127 @@ +/** + * This file provides the styles for printing. + * + * @todo: improve and finish + */ + +body { + /* + font: normal 12pt/1.2 serif; + color: #000; + background-color: #fff; + */ +} + +/* hide certain sections */ +.a11y, +div.notify, div.info, div.success, div.error, +#dokuwiki__header .tools, #dokuwiki__aside, +.dokuwiki .breadcrumbs, .dokuwiki .toc, .dokuwiki .secedit, +#dokuwiki__pagetools, #dokuwiki__footer { + display: none; +} + +.dokuwiki h1, .dokuwiki h2, .dokuwiki h3, .dokuwiki h4, .dokuwiki h5, +.dokuwiki caption, .dokuwiki legend { + clear: both; +} +.dokuwiki ul { list-style: disc outside; } +.dokuwiki ol { list-style: decimal outside; } +.dokuwiki ol ol { list-style-type: lower-alpha; } +.dokuwiki ol ol ol { list-style-type: upper-roman; } +.dokuwiki ol ol ol ol { list-style-type: upper-alpha; } +.dokuwiki ol ol ol ol ol { list-style-type: lower-roman; } + +/* undo icons */ +.dokuwiki a:link, .dokuwiki a:visited { + text-decoration: underline; + color: #333; + background-color: inherit; + background-image: none; + padding: 0; +} + +/* display href after link */ +a.urlextern:after, +a.interwiki:after, +a.mail:after { + content: " [" attr(href) "]"; + font-size: 90%; +} + +/* code blocks */ +.dokuwiki pre { + font-family: monospace; +} +.dokuwiki dl.code dt, .dokuwiki dl.file dt { + font-weight: bold; +} + +/* images */ +.dokuwiki img { border-width: 0; vertical-align: middle; } +.dokuwiki img.medialeft { margin: .5em 1.5em .5em 0; float: left; } +.dokuwiki img.mediaright { margin: .5em 0 .5em 1.5em; float: right; } +.dokuwiki img.mediacenter { margin: .5em auto; display: block; } + +/* align table cells */ +.dokuwiki .leftalign { text-align: left; } +.dokuwiki .centeralign { text-align: center; } +.dokuwiki .rightalign { text-align: right; } + +/* underline */ +.dokuwiki em.u { font-style: normal; text-decoration: underline; } +.dokuwiki em em.u { font-style: italic; } + +div.clearer { + clear: both; + line-height: 0; + height: 0; + overflow: hidden; +} + +.dokuwiki blockquote { + padding: 0 10pt; + margin: 0; + border: solid #ccc; + border-width: 0 0 0 2pt; +} + +/* tables */ +.dokuwiki table { + border-collapse: collapse; + empty-cells: show; + border-spacing: 0; + border: 1pt solid #ccc; +} +.dokuwiki th, .dokuwiki td { + padding: 3pt 5pt; + margin: 0; + vertical-align: top; + border: 1pt solid #666; + text-align: left; +} +.dokuwiki th { + font-weight: bold; +} + + +/*____________ a bit of layout ____________*/ + +#dokuwiki__header { + border-bottom: 2pt solid #ccc; +} +#dokuwiki__header h1 { + font-size: 1.5em; +} +#dokuwiki__header h1 a { + text-decoration: none; +} +#dokuwiki__header h1 img { + float: left; + margin-right: .5em; +} +.dokuwiki div.footnotes { + clear: both; + border-top: 1pt solid #000; + margin-top: 10pt; +} diff --git a/lib/tpl/dokuwiki/css/rtl.css b/lib/tpl/dokuwiki/css/rtl.css new file mode 100644 index 000000000..790545a1b --- /dev/null +++ b/lib/tpl/dokuwiki/css/rtl.css @@ -0,0 +1,571 @@ +/** + * This file provides layout and design corrections for right-to-left + * languages. + * + * @author Anika Henke + */ + +/*____________ basic ____________*/ + +caption, +td, +th { + text-align: right; +} + +ul, ol { + padding: 0 1.5em 0 0; +} +li, dd { + margin: 0 1.5em 0 0; +} +blockquote { + border-width: 0 .25em 0 0; +} + +h1, h2, h3, h4, h5, h6, +caption, legend { + clear: right; +} + +.a11y { + left: auto; + right: -9000px; +} + + +/*____________ _imgdetail ____________*/ + +#dokuwiki__detail div.content img { + float: right; + margin-right: 0; + margin-left: 1.5em; +} +#dokuwiki__detail div.content div.img_detail { + float: right +} + + +/*____________ _mediamanager ____________*/ + +#mediamgr__aside { + left: auto; + right: 0; + border-right-width: 0; + border-left: 1px solid __border__; +} +#mediamgr__content { + right: auto; + left: 0; +} + +#media__opts input { + margin-right: 0; + margin-left: .3em; +} + +#media__tree ul { + padding-left: 0; + padding-right: .2em; +} +#media__tree ul li { + clear: right; + margin-right: 0; +} +#media__tree ul li img { + float: right; + padding: .5em 0 0 .3em; +} +#media__tree ul li li { + margin-left: 0; + margin-right: 1.5em; +} + +#media__content a.mediafile { + margin-right: 0; + margin-left: 1.5em; +} +#media__content div.detail div.thumb { + float: right; + margin: 0 18px 0 .5em; +} +#media__content form.meta div.metafield { + clear: right; +} +#media__content form.meta label { + float: right; + clear: right; +} +#media__content form.meta .edit { + float: right; +} +#media__content form.meta div.buttons { + clear: right; + margin: .2em 25% 0 0; +} + + +/*____________ _links ____________*/ + +/* if link icons don't work as expected, remove the following lines */ +.dokuwiki a.urlextern, +.dokuwiki a.windows, +.dokuwiki a.mail, +.dokuwiki a.interwiki, +.dokuwiki a.mediafile { + background-position: right center; + padding: 0 17px 0 0; +} + + +/*____________ _toc ____________*/ + +.dokuwiki div.toc { + float: left; + margin: 0 1.4em 1.4em 0; +} +.dokuwiki .toc span.toc_open, +.dokuwiki .toc span.toc_close { + float: left; +} +.dokuwiki #toc__inside ul ul { + padding-left: 0; + padding-right: 1em; +} + +.dokuwiki ul.idx { + padding-right: 0; +} + + +/*____________ _footnotes ____________*/ + + +/*____________ _search ____________*/ + +.dokuwiki div.search_quickresult ul li { + float: right; +} +.dokuwiki form.search div.ajax_qsearch { + left: auto; + right: -13.5em; + text-align: right; +} + + +/*____________ _recent ____________*/ + +.dokuwiki #dw__recent ul li, +.dokuwiki #page__revisions ul li { + margin-right: 0; +} + + +/*____________ _diff ____________*/ + + +/*____________ _edit ____________*/ + +.dokuwiki div.toolbar #draft__status { + float: left; +} +.dokuwiki #wiki__editbar #size__ctl { + float: left; +} +.dokuwiki #wiki__editbar #size__ctl img { + cursor: pointer; +} +.dokuwiki #wiki__editbar .editButtons { + margin-right: 0; + margin-left: 1em; +} + +.dokuwiki .secedit { + float: left; +} + + +/*____________ _modal ____________*/ + +#link__wiz_close { + float: left; +} +#link__wiz_result { + text-align: right; +} +#link__wiz_result div.type_u, +#link__wiz_result div.type_f, +#link__wiz_result div.type_d { + padding: 3px 22px 3px 3px; + background-position: 257px 3px; +} + + +/*____________ _forms ____________*/ + +.dokuwiki label.block { + text-align: left; +} +.dokuwiki label.simple { + text-align: right; +} + +form#subscribe__form fieldset { + text-align: right; +} + + +/*____________ _admin ____________*/ + +.dokuwiki ul.admin_tasks { + float: right; +} +.dokuwiki ul.admin_tasks li { + padding-left: 0; + padding-right: 35px; + background-position: right 0; +} + +.dokuwiki #admin__version { + clear: right; + float: left; +} + + +/*____________ includes ____________*/ + + +/*____________ structure ____________*/ + +#dokuwiki__header .headings { + float: right; + text-align: right; +} +#dokuwiki__header .tools { + float: left; + text-align: left; +} + +#dokuwiki__aside { + float: right; +} +#dokuwiki__aside .pad { + margin: 0 0 0 1.5em; +} + +.hasSidebar #dokuwiki__content { + float: left; + margin-left: 0; + margin-right: -__sidebar_width__; +} +.hasSidebar #dokuwiki__content .pad { + margin-left: 0; + margin-right: __sidebar_width__; +} + +/*____________ design ____________*/ + +#dokuwiki__header h1 img { + float: right; + margin-left: .5em; + margin-right: 0; +} + +#dokuwiki__sitetools form.search input.edit { + padding: .35em .1em .35em 22px; +} +#dokuwiki__sitetools form.search input.button { + background-position: 5px 0; + margin-left: 0; + margin-right: -20px; +} + +#dokuwiki__usertools { + text-align: left; + left: 40px; + right: auto; +} + +#dokuwiki__sitetools { + text-align: left; +} + +#dokuwiki__aside ul, #dokuwiki__aside ol { + padding-right: 0; +} + +.dokuwiki .pageId { + right: auto; + left: -1em; +} + +.dokuwiki .docInfo { + text-align: left; +} + +.dokuwiki div.toolbar button.toolbutton:first-child { + border-top-left-radius: 0; + border-bottom-left-radius: 0; + border-top-right-radius: 4px; + border-bottom-right-radius: 4px; + border-left-width: 0; + border-right-width: 1px; +} +.dokuwiki div.toolbar button.toolbutton:last-child { + border-top-left-radius: 4px; + border-bottom-left-radius: 4px; + border-top-right-radius: 0; + border-bottom-right-radius: 0; + border-left-width: 1px; +} + +.dokuwiki div.section_highlight { + margin-right: -2em; + border-right-width: 1em; +} + +#dokuwiki__footer .license img { + margin: 0 0 0 .5em; +} + +.dokuwiki div.toc { + margin: -2em 1.4em .5em -2em; + border-left-width: 0; + border-right: 1px solid __border__; +} +.dokuwiki #toc__inside ul { + padding: 0 1.5em 0 0; +} + +#dokuwiki__detail div.img_detail dl dt { + float: right; + text-align: left; + clear: right; +} +#dokuwiki__detail div.img_detail dl dd { + margin-left: 0; + margin-right: 9.5em; +} + + +/*____________ pagetools ____________*/ + +#dokuwiki__usertools { + right: auto; + left: 40px; +} + +#dokuwiki__pagetools { + right: auto; + left: -40px; +} + +#dokuwiki__pagetools ul { + right: auto; + left: 0; + text-align: left; +} + +#dokuwiki__pagetools ul li a { + padding: 5px 5px 5px 40px; + background-position: left 0; +} + +#dokuwiki__pagetools:hover ul, +#dokuwiki__pagetools ul li a:focus { + box-shadow: -2px 2px 2px __text_alt__; +} + +/* all available icons in sprite */ +#dokuwiki__pagetools ul li a.edit { + background-position: left 0; +} +#dokuwiki__pagetools ul li a.edit:hover, +#dokuwiki__pagetools ul li a.edit:active, +#dokuwiki__pagetools ul li a.edit:focus { + background-position: left -45px; +} + +#dokuwiki__pagetools ul li a.create { + background-position: left -90px; +} +#dokuwiki__pagetools ul li a.create:hover, +#dokuwiki__pagetools ul li a.create:active, +#dokuwiki__pagetools ul li a.create:focus { + background-position: left -135px; +} + +#dokuwiki__pagetools ul li a.show { + background-position: left -270px; +} +#dokuwiki__pagetools ul li a.show:hover, +#dokuwiki__pagetools ul li a.show:active, +#dokuwiki__pagetools ul li a.show:focus { + background-position: left -315px; +} + +#dokuwiki__pagetools ul li a.source { + background-position: left -360px; +} +#dokuwiki__pagetools ul li a.source:hover, +#dokuwiki__pagetools ul li a.source:active, +#dokuwiki__pagetools ul li a.source:focus { + background-position: left -405px; +} + +#dokuwiki__pagetools ul li a.draft { + background-position: left -180px; +} +#dokuwiki__pagetools ul li a.draft:hover, +#dokuwiki__pagetools ul li a.draft:active, +#dokuwiki__pagetools ul li a.draft:focus { + background-position: left -225px; +} + +#dokuwiki__pagetools ul li a.revs { + background-position: left -540px; +} +#dokuwiki__pagetools ul li a.revs:hover, +#dokuwiki__pagetools ul li a.revs:active, +#dokuwiki__pagetools ul li a.revs:focus, +.mode_revisions #dokuwiki__pagetools ul li a.revs { + background-position: left -585px; +} + +#dokuwiki__pagetools ul li a.backlink { + background-position: left -630px; +} +#dokuwiki__pagetools ul li a.backlink:hover, +#dokuwiki__pagetools ul li a.backlink:active, +#dokuwiki__pagetools ul li a.backlink:focus, +.mode_backlink #dokuwiki__pagetools ul li a.backlink { + background-position: left -675px; +} + +#dokuwiki__pagetools ul li a.top { + background-position: left -810px; +} +#dokuwiki__pagetools ul li a.top:hover, +#dokuwiki__pagetools ul li a.top:active, +#dokuwiki__pagetools ul li a.top:focus { + background-position: left -855px; +} + +#dokuwiki__pagetools ul li a.revert { + background-position: left -450px; +} +#dokuwiki__pagetools ul li a.revert:hover, +#dokuwiki__pagetools ul li a.revert:active, +#dokuwiki__pagetools ul li a.revert:focus, +.mode_revert #dokuwiki__pagetools ul li a.revert { + background-position: left -495px; +} + +#dokuwiki__pagetools ul li a.subscribe { + background-position: left -720px; +} +#dokuwiki__pagetools ul li a.subscribe:hover, +#dokuwiki__pagetools ul li a.subscribe:active, +#dokuwiki__pagetools ul li a.subscribe:focus, +.mode_subscribe #dokuwiki__pagetools ul li a.subscribe { + background-position: left -765px; +} + +#dokuwiki__pagetools ul li a.mediaManager { + background-position: left -900px; +} +#dokuwiki__pagetools ul li a.mediaManager:hover, +#dokuwiki__pagetools ul li a.mediaManager:active, +#dokuwiki__pagetools ul li a.mediaManager:focus { + background-position: left -945px; +} + +#dokuwiki__pagetools ul li a.back { + background-position: left -990px; +} +#dokuwiki__pagetools ul li a.back:hover, +#dokuwiki__pagetools ul li a.back:active, +#dokuwiki__pagetools ul li a.back:focus { + background-position: left -1035px; +} + + +/*____________ content ____________*/ + +/* section indenting +.dokuwiki .page h1 {margin-left: 0; margin-right: 0;} +.dokuwiki .page h2 {margin-left: 0; margin-right: .666em;} +.dokuwiki .page h3 {margin-left: 0; margin-right: 1.776em;} +.dokuwiki .page h4 {margin-left: 0; margin-right: 3em;} +.dokuwiki .page h5 {margin-left: 0; margin-right: 4.5712em;} +.dokuwiki .page div.level1 {margin-left: 0; margin-right: 0;} +.dokuwiki .page div.level2 {margin-left: 0; margin-right: 1em;} +.dokuwiki .page div.level3 {margin-left: 0; margin-right: 2em;} +.dokuwiki .page div.level4 {margin-left: 0; margin-right: 3em;} +.dokuwiki .page div.level5 {margin-left: 0; margin-right: 4em;} +*/ + +.dokuwiki dl.code dt, +.dokuwiki dl.file dt { + margin-left: 0; + margin-right: 1em; +} + +.JSpopup ul, +.JSpopup ol { + padding-right: 0; +} + + +/*____________ mobile ____________*/ + +@media only screen and (max-width: 480px), only screen and (max-device-width: 480px) { + + +.hasSidebar #dokuwiki__content, +.hasSidebar #dokuwiki__content .pad { + margin-right: 0; +} + +#dokuwiki__header ul.a11y.skip { + left: auto !important; + right: 0 !important; + float: left; + padding-right: 0; +} +#dokuwiki__header ul.a11y.skip li { + margin: 0 .35em 0 0; +} + +#dokuwiki__header .headings, +#dokuwiki__header .tools { + float: none; + text-align: right; + width: auto; +} +#dokuwiki__sitetools { + text-align: right; +} + +#dokuwiki__sitetools form.search { + float: right; + margin: 0 0 .2em .2em; +} + +#dokuwiki__header .mobileTools { + float: left; +} + +.dokuwiki div.toc { + float: none; + margin: 0 0 1em 0; + border-right-width: 0; +} + +.dokuwiki label.block { + text-align: right; +} + + + +} /* /@media */ diff --git a/lib/tpl/dokuwiki/css/structure.css b/lib/tpl/dokuwiki/css/structure.css new file mode 100644 index 000000000..4e3a14be8 --- /dev/null +++ b/lib/tpl/dokuwiki/css/structure.css @@ -0,0 +1,58 @@ +/** + * This file provides styles for the general layout structure. + * + * @author Anika Henke + */ + +body { + margin: 0 auto; +} +#dokuwiki__site { + margin: 0 auto; + max-width: __site_width__; +} +#dokuwiki__site .site { + padding: 0 .5em; +} + +#dokuwiki__header { + width: 100%; +} +#dokuwiki__header .pad { +} + #dokuwiki__header .headings { + float: left; + } + #dokuwiki__header .tools { + float: right; + text-align: right; + } + +#dokuwiki__site .wrapper { + position: relative; +} + + #dokuwiki__aside { + width: __sidebar_width__; + float: left; + position: relative; + display: block; + } + #dokuwiki__aside .pad { + margin: 0 1.5em 0 0; + } + + .hasSidebar #dokuwiki__content { + float: right; + margin-left: -__sidebar_width__; + width: 100%; + } + .hasSidebar #dokuwiki__content .pad { + margin-left: __sidebar_width__; + } + +#dokuwiki__footer { + clear: both; +} +#dokuwiki__footer .pad { +} diff --git a/lib/tpl/dokuwiki/detail.php b/lib/tpl/dokuwiki/detail.php new file mode 100644 index 000000000..287827253 --- /dev/null +++ b/lib/tpl/dokuwiki/detail.php @@ -0,0 +1,144 @@ + + * @author Anika Henke + * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) + */ + +// must be run from within DokuWiki +if (!defined('DOKU_INC')) die(); +@require_once(dirname(__FILE__).'/tpl_functions.php'); /* include hook for template functions */ + +$showSidebar = $conf['sidebar'] && page_exists($conf['sidebar']) && ($ACT=='show'); +?> + + + + + + <?php echo hsc(tpl_img_getTag('IPTC.Headline',$IMG))?> + [<?php echo strip_tags($conf['title'])?>] + + + + + + + + + + + + + are added to make it possible to e.g. style a page differently if it's in edit mode, + see http://www.dokuwiki.org/devel:action_modes for a list of action modes */ ?> + +
    + + + +
    + + +
    + + +
    + + +
    + + + + '.$ERROR.''; + else: ?> + +

    + + + +
    +
    + $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/dokuwiki/images/apple-touch-icon.png b/lib/tpl/dokuwiki/images/apple-touch-icon.png new file mode 100644 index 000000000..45fa4e7b0 Binary files /dev/null and b/lib/tpl/dokuwiki/images/apple-touch-icon.png differ diff --git a/lib/tpl/dokuwiki/images/bullet.png b/lib/tpl/dokuwiki/images/bullet.png new file mode 100644 index 000000000..5da537443 Binary files /dev/null and b/lib/tpl/dokuwiki/images/bullet.png differ diff --git a/lib/tpl/dokuwiki/images/closed.png b/lib/tpl/dokuwiki/images/closed.png new file mode 100644 index 000000000..3691ebc17 Binary files /dev/null and b/lib/tpl/dokuwiki/images/closed.png differ diff --git a/lib/tpl/dokuwiki/images/favicon.ico b/lib/tpl/dokuwiki/images/favicon.ico new file mode 100644 index 000000000..8b9616abb Binary files /dev/null and b/lib/tpl/dokuwiki/images/favicon.ico differ diff --git a/lib/tpl/dokuwiki/images/link_icon.gif b/lib/tpl/dokuwiki/images/link_icon.gif new file mode 100644 index 000000000..815ccb1b1 Binary files /dev/null and b/lib/tpl/dokuwiki/images/link_icon.gif differ diff --git a/lib/tpl/dokuwiki/images/logo.png b/lib/tpl/dokuwiki/images/logo.png new file mode 100644 index 000000000..8b794dd64 Binary files /dev/null and b/lib/tpl/dokuwiki/images/logo.png differ diff --git a/lib/tpl/dokuwiki/images/mail_icon.gif b/lib/tpl/dokuwiki/images/mail_icon.gif new file mode 100644 index 000000000..50a87a9a0 Binary files /dev/null and b/lib/tpl/dokuwiki/images/mail_icon.gif differ diff --git a/lib/tpl/dokuwiki/images/open.png b/lib/tpl/dokuwiki/images/open.png new file mode 100644 index 000000000..40ff129be Binary files /dev/null and b/lib/tpl/dokuwiki/images/open.png differ diff --git a/lib/tpl/dokuwiki/images/pagetools-license.txt b/lib/tpl/dokuwiki/images/pagetools-license.txt new file mode 100644 index 000000000..299624c62 --- /dev/null +++ b/lib/tpl/dokuwiki/images/pagetools-license.txt @@ -0,0 +1,4 @@ +Icon set: iPhone toolbar icons +Designer: TheWorkingGroup.ca +License: Creative Commons Attribution-Share Alike License [http://creativecommons.org/licenses/by-sa/3.0/] +URL: http://blog.twg.ca/2009/09/free-iphone-toolbar-icons/ diff --git a/lib/tpl/dokuwiki/images/pagetools-sprite.png b/lib/tpl/dokuwiki/images/pagetools-sprite.png new file mode 100644 index 000000000..a0f4036ff Binary files /dev/null and b/lib/tpl/dokuwiki/images/pagetools-sprite.png differ diff --git a/lib/tpl/dokuwiki/images/pagetools-sprite.xcf b/lib/tpl/dokuwiki/images/pagetools-sprite.xcf new file mode 100644 index 000000000..07c1d83fb Binary files /dev/null and b/lib/tpl/dokuwiki/images/pagetools-sprite.xcf differ diff --git a/lib/tpl/dokuwiki/images/pagetools.xcf b/lib/tpl/dokuwiki/images/pagetools.xcf new file mode 100644 index 000000000..034b39a42 Binary files /dev/null and b/lib/tpl/dokuwiki/images/pagetools.xcf differ diff --git a/lib/tpl/dokuwiki/images/resizecol.png b/lib/tpl/dokuwiki/images/resizecol.png new file mode 100644 index 000000000..f0111507c Binary files /dev/null and b/lib/tpl/dokuwiki/images/resizecol.png differ diff --git a/lib/tpl/dokuwiki/images/search.png b/lib/tpl/dokuwiki/images/search.png new file mode 100644 index 000000000..2adfc7357 Binary files /dev/null and b/lib/tpl/dokuwiki/images/search.png differ diff --git a/lib/tpl/dokuwiki/images/toc-arrows.png b/lib/tpl/dokuwiki/images/toc-arrows.png new file mode 100644 index 000000000..9f441eb26 Binary files /dev/null and b/lib/tpl/dokuwiki/images/toc-arrows.png differ diff --git a/lib/tpl/dokuwiki/images/toc-bullet.png b/lib/tpl/dokuwiki/images/toc-bullet.png new file mode 100644 index 000000000..a6f0169c3 Binary files /dev/null and b/lib/tpl/dokuwiki/images/toc-bullet.png differ diff --git a/lib/tpl/dokuwiki/images/windows.gif b/lib/tpl/dokuwiki/images/windows.gif new file mode 100644 index 000000000..4f12acce1 Binary files /dev/null and b/lib/tpl/dokuwiki/images/windows.gif differ diff --git a/lib/tpl/dokuwiki/main.php b/lib/tpl/dokuwiki/main.php new file mode 100644 index 000000000..84334a4db --- /dev/null +++ b/lib/tpl/dokuwiki/main.php @@ -0,0 +1,100 @@ + + * @author Clarence Lee + * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) + */ + +if (!defined('DOKU_INC')) die(); /* must be run from within DokuWiki */ +@require_once(dirname(__FILE__).'/tpl_functions.php'); /* include hook for template functions */ + +$showSidebar = $conf['sidebar'] && page_exists($conf['sidebar']) && ($ACT=='show'); +?> + + + + + <?php tpl_pagetitle() ?> [<?php echo strip_tags($conf['title']) ?>] + + + + + + + + + + + + are added to make it possible to e.g. style a page differently if it's in edit mode, + see http://www.dokuwiki.org/devel:action_modes for a list of action modes */ ?> + +
    + + + +
    + + + +
    + + + + +
    + + + +
    + +
    + +
    + + + + + + +
    + +
    + + +
    + +
    + + +
    +

    +
    +
      + ', ''); + tpl_action('revert', 1, 'li', 0, '', ''); + tpl_action('revisions', 1, 'li', 0, '', ''); + tpl_action('backlink', 1, 'li', 0, '', ''); + tpl_action('subscribe', 1, 'li', 0, '', ''); + tpl_action('top', 1, 'li', 0, '', ''); + ?> +
    +
    +
    +
    + + +
    + +
    + + + diff --git a/lib/tpl/dokuwiki/mediamanager.php b/lib/tpl/dokuwiki/mediamanager.php new file mode 100644 index 000000000..d7d88f936 --- /dev/null +++ b/lib/tpl/dokuwiki/mediamanager.php @@ -0,0 +1,48 @@ + + * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) + */ +// must be run from within DokuWiki +if (!defined('DOKU_INC')) die(); +@require_once(dirname(__FILE__).'/tpl_functions.php'); /* include hook for template functions */ + +?> + + + + + + <?php echo hsc($lang['mediaselect'])?> + [<?php echo strip_tags($conf['title'])?>] + + + + + + + + + +
    + +
    +

    + + +
    + + +
    + +
    + +
    +
    + + + diff --git a/lib/tpl/dokuwiki/style.ini b/lib/tpl/dokuwiki/style.ini new file mode 100644 index 000000000..8ac4fbe31 --- /dev/null +++ b/lib/tpl/dokuwiki/style.ini @@ -0,0 +1,73 @@ +; Please see http://www.php.net/manual/en/function.parse-ini-file.php +; for limitations of the ini format used here + +; 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] + +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/pagetools.css = screen +css/content.css = screen +css/includes.css = screen +css/mobile.css = screen + +css/rtl.css = rtl +css/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__ = "#333" +__background__ = "#fff" +; alternative text and background colors +__text_alt__ = "#999" +__background_alt__ = "#eee" +; neutral text and background colors +__text_neu__ = "#666" +__background_neu__ = "#ddd" +; border color +__border__ = "#ccc" + +;-------------------------------------------------------------------------- + +__background_site__ = "#fbfaf9" + +; these are used for links +__link__ = "#2b73b7" +__existing__ = "#080" +__missing__ = "#d30" + +; highlighting search snippets +__highlight__ = "#ff9" + +; sidebar width +__site_width__ = "75em" +__sidebar_width__ = "16em" diff --git a/lib/tpl/dokuwiki/template.info.txt b/lib/tpl/dokuwiki/template.info.txt new file mode 100644 index 000000000..e049270ee --- /dev/null +++ b/lib/tpl/dokuwiki/template.info.txt @@ -0,0 +1,7 @@ +base dokuwiki +author Anika Henke, Andreas Gohr, Clarence Lee +email andi@splitbrain.org +date 2012-01-30 +name DokuWiki Template +desc DokuWiki's default template 2012 +url http://www.dokuwiki.org/template diff --git a/lib/tpl/dokuwiki/tpl_footer.php b/lib/tpl/dokuwiki/tpl_footer.php new file mode 100644 index 000000000..fcc9d21c7 --- /dev/null +++ b/lib/tpl/dokuwiki/tpl_footer.php @@ -0,0 +1,6 @@ + +
    + +
    + + diff --git a/lib/tpl/dokuwiki/tpl_functions.php b/lib/tpl/dokuwiki/tpl_functions.php new file mode 100644 index 000000000..c024f33e7 --- /dev/null +++ b/lib/tpl/dokuwiki/tpl_functions.php @@ -0,0 +1,30 @@ + + */ +function _tpl_include($fn) { + $confFile = DOKU_CONF.$fn; + $tplFile = dirname(__FILE__).'/'.$fn; + + if (file_exists($confFile)) + include($confFile); + else if (file_exists($tplFile)) + include($tplFile); +} diff --git a/lib/tpl/dokuwiki/tpl_header.php b/lib/tpl/dokuwiki/tpl_header.php new file mode 100644 index 000000000..91d8876b9 --- /dev/null +++ b/lib/tpl/dokuwiki/tpl_header.php @@ -0,0 +1,83 @@ + +
    + + + + +
    +
      +
      • +
    + +

    '.$conf['title'].'', + 'accesskey="h" title="[H]"' + ); + ?>

    + +

    + +
    + +
    + + +
    +

    +
      + would be: tpl_action('edit',0,'li') */ + if ($_SERVER['REMOTE_USER']) { + echo '
    • '; + tpl_userinfo(); /* 'Logged in as ...' */ + echo '
      • '; + } + tpl_action('admin', 1, 'li'); + tpl_action('profile', 1, 'li'); + tpl_action('register', 1, 'li'); + tpl_action('login', 1, 'li'); + ?> +
    +
    + + + +
    +

    + + +
    + +
    +
      + +
    +
    + +
    + + + +
    + +
    + + +
    + +
    + + +
    +
    diff --git a/main.php b/main.php deleted file mode 100644 index 84334a4db..000000000 --- a/main.php +++ /dev/null @@ -1,100 +0,0 @@ - - * @author Clarence Lee - * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - */ - -if (!defined('DOKU_INC')) die(); /* must be run from within DokuWiki */ -@require_once(dirname(__FILE__).'/tpl_functions.php'); /* include hook for template functions */ - -$showSidebar = $conf['sidebar'] && page_exists($conf['sidebar']) && ($ACT=='show'); -?> - - - - - <?php tpl_pagetitle() ?> [<?php echo strip_tags($conf['title']) ?>] - - - - - - - - - - - - are added to make it possible to e.g. style a page differently if it's in edit mode, - see http://www.dokuwiki.org/devel:action_modes for a list of action modes */ ?> - -
    - - - -
    - - - -
    - - - - -
    - - - -
    - -
    - -
    - - - - - - -
    - -
    - - -
    - -
    - - -
    -

    -
    -
      - ', ''); - tpl_action('revert', 1, 'li', 0, '', ''); - tpl_action('revisions', 1, 'li', 0, '', ''); - tpl_action('backlink', 1, 'li', 0, '', ''); - tpl_action('subscribe', 1, 'li', 0, '', ''); - tpl_action('top', 1, 'li', 0, '', ''); - ?> -
    -
    -
    -
    - - -
    - -
    - - - diff --git a/mediamanager.php b/mediamanager.php deleted file mode 100644 index d7d88f936..000000000 --- a/mediamanager.php +++ /dev/null @@ -1,48 +0,0 @@ - - * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - */ -// must be run from within DokuWiki -if (!defined('DOKU_INC')) die(); -@require_once(dirname(__FILE__).'/tpl_functions.php'); /* include hook for template functions */ - -?> - - - - - - <?php echo hsc($lang['mediaselect'])?> - [<?php echo strip_tags($conf['title'])?>] - - - - - - - - - -
    - -
    -

    - - -
    - - -
    - -
    - -
    -
    - - - diff --git a/style.ini b/style.ini deleted file mode 100644 index 8ac4fbe31..000000000 --- a/style.ini +++ /dev/null @@ -1,73 +0,0 @@ -; Please see http://www.php.net/manual/en/function.parse-ini-file.php -; for limitations of the ini format used here - -; 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] - -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/pagetools.css = screen -css/content.css = screen -css/includes.css = screen -css/mobile.css = screen - -css/rtl.css = rtl -css/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__ = "#333" -__background__ = "#fff" -; alternative text and background colors -__text_alt__ = "#999" -__background_alt__ = "#eee" -; neutral text and background colors -__text_neu__ = "#666" -__background_neu__ = "#ddd" -; border color -__border__ = "#ccc" - -;-------------------------------------------------------------------------- - -__background_site__ = "#fbfaf9" - -; these are used for links -__link__ = "#2b73b7" -__existing__ = "#080" -__missing__ = "#d30" - -; highlighting search snippets -__highlight__ = "#ff9" - -; sidebar width -__site_width__ = "75em" -__sidebar_width__ = "16em" diff --git a/template.info.txt b/template.info.txt deleted file mode 100644 index e049270ee..000000000 --- a/template.info.txt +++ /dev/null @@ -1,7 +0,0 @@ -base dokuwiki -author Anika Henke, Andreas Gohr, Clarence Lee -email andi@splitbrain.org -date 2012-01-30 -name DokuWiki Template -desc DokuWiki's default template 2012 -url http://www.dokuwiki.org/template diff --git a/tpl_footer.php b/tpl_footer.php deleted file mode 100644 index fcc9d21c7..000000000 --- a/tpl_footer.php +++ /dev/null @@ -1,6 +0,0 @@ - -
    - -
    - - diff --git a/tpl_functions.php b/tpl_functions.php deleted file mode 100644 index c024f33e7..000000000 --- a/tpl_functions.php +++ /dev/null @@ -1,30 +0,0 @@ - - */ -function _tpl_include($fn) { - $confFile = DOKU_CONF.$fn; - $tplFile = dirname(__FILE__).'/'.$fn; - - if (file_exists($confFile)) - include($confFile); - else if (file_exists($tplFile)) - include($tplFile); -} diff --git a/tpl_header.php b/tpl_header.php deleted file mode 100644 index 91d8876b9..000000000 --- a/tpl_header.php +++ /dev/null @@ -1,83 +0,0 @@ - -
    - - - - -
    -
      -
      • -
    - -

    '.$conf['title'].'', - 'accesskey="h" title="[H]"' - ); - ?>

    - -

    - -
    - -
    - - -
    -

    -
      - would be: tpl_action('edit',0,'li') */ - if ($_SERVER['REMOTE_USER']) { - echo '
    • '; - tpl_userinfo(); /* 'Logged in as ...' */ - echo '
      • '; - } - tpl_action('admin', 1, 'li'); - tpl_action('profile', 1, 'li'); - tpl_action('register', 1, 'li'); - tpl_action('login', 1, 'li'); - ?> -
    -
    - - - -
    -

    - - -
    - -
    -
      - -
    -
    - -
    - - - -
    - -
    - - -
    - -
    - - -
    -
    -- cgit v1.2.3 From 5c0c6845e9d948437a54eb986c9f339dfc4b2c62 Mon Sep 17 00:00:00 2001 From: PCPA Date: Mon, 6 Feb 2012 23:39:40 +0100 Subject: Russian language update --- inc/lang/ru/lang.php | 103 ++++++++++++++----------------- lib/plugins/acl/lang/ru/lang.php | 1 + lib/plugins/config/lang/ru/lang.php | 6 ++ lib/plugins/plugin/lang/ru/lang.php | 2 + lib/plugins/popularity/lang/ru/lang.php | 1 + lib/plugins/revert/lang/ru/lang.php | 1 + lib/plugins/usermanager/lang/ru/lang.php | 1 + 7 files changed, 57 insertions(+), 58 deletions(-) diff --git a/inc/lang/ru/lang.php b/inc/lang/ru/lang.php index 10fca5477..0b1af234c 100644 --- a/inc/lang/ru/lang.php +++ b/inc/lang/ru/lang.php @@ -19,15 +19,15 @@ * @author Aleksandr Selivanov * @author Ladyko Andrey * @author Eugene + * @author Johnny Utah */ $lang['encoding'] = ' utf-8'; $lang['direction'] = 'ltr'; -$lang['doublequoteopening'] = '«'; //“ -$lang['doublequoteclosing'] = '»'; //” -$lang['singlequoteopening'] = '„'; //‘ -$lang['singlequoteclosing'] = '“'; //’ -$lang['apostrophe'] = '’'; //’ - +$lang['doublequoteopening'] = '«'; +$lang['doublequoteclosing'] = '»'; +$lang['singlequoteopening'] = '„'; +$lang['singlequoteclosing'] = '“'; +$lang['apostrophe'] = '’'; $lang['btn_edit'] = 'Править страницу'; $lang['btn_source'] = 'Показать исходный текст'; $lang['btn_show'] = 'Показать страницу'; @@ -63,7 +63,6 @@ $lang['btn_revert'] = 'Восстановить'; $lang['btn_register'] = 'Зарегистрироваться'; $lang['btn_apply'] = 'Применить'; $lang['btn_media'] = 'Media Manager'; - $lang['loggedinas'] = 'Зашли как'; $lang['user'] = 'Логин'; $lang['pass'] = 'Пароль'; @@ -78,7 +77,6 @@ $lang['badlogin'] = 'Извините, неверное имя по $lang['minoredit'] = 'Небольшие изменения'; $lang['draftdate'] = 'Черновик сохранён'; $lang['nosecedit'] = 'За это время страница была изменена и информация о секции устарела. Загружена полная версия страницы.'; - $lang['regmissing'] = 'Извините, вам следует заполнить все поля.'; $lang['reguexists'] = 'Извините, пользователь с таким логином уже существует.'; $lang['regsuccess'] = 'Пользователь создан, пароль выслан на адрес электронной почты.'; @@ -88,12 +86,10 @@ $lang['regbadmail'] = 'Данный вами адрес электр $lang['regbadpass'] = 'Два введённых пароля не идентичны. Пожалуйста, попробуйте ещё раз.'; $lang['regpwmail'] = 'Ваш пароль для системы «ДокуВики»'; $lang['reghere'] = 'У вас ещё нет аккаунта? Зарегистрируйтесь'; - $lang['profna'] = 'Данная вики не поддерживает изменение профиля'; $lang['profnochange'] = 'Изменений не было внесено, профиль не обновлён.'; $lang['profnoempty'] = 'Логин и адрес электронной почты не могут быть пустыми.'; $lang['profchanged'] = 'Профиль пользователя успешно обновлён.'; - $lang['pwdforget'] = 'Забыли пароль? Получите новый'; $lang['resendna'] = 'Данная вики не поддерживает повторную отправку пароля.'; $lang['resendpwd'] = 'Выслать пароль для'; @@ -102,10 +98,8 @@ $lang['resendpwdnouser'] = 'Пользователь с таким лог $lang['resendpwdbadauth'] = 'Извините, неверный код авторизации. Убедитесь, что вы полностью скопировали ссылку. '; $lang['resendpwdconfirm'] = 'Ссылка для подтверждения пароля была выслана по электронной почте. '; $lang['resendpwdsuccess'] = 'Ваш новый пароль был выслан по электронной почте.'; - $lang['license'] = 'За исключением случаев, когда указано иное, содержимое этой вики предоставляется на условиях следующей лицензии:'; $lang['licenseok'] = 'Примечание: редактируя эту страницу, вы соглашаетесь на использование своего вклада на условиях следующей лицензии:'; - $lang['searchmedia'] = 'Поиск по имени файла:'; $lang['searchmedia_in'] = 'Поиск в %s'; $lang['txt_upload'] = 'Выберите файл для загрузки'; @@ -113,7 +107,7 @@ $lang['txt_filename'] = 'Введите имя файла в вики ( $lang['txt_overwrt'] = 'Перезаписать существующий файл'; $lang['lockedby'] = 'В данный момент заблокирован'; $lang['lockexpire'] = 'Блокировка истекает в'; -$lang['js']['willexpire'] = 'Ваша блокировка редактирования этой страницы истекает в течение минуты.\nЧтобы избежать конфликтов и сбросить таймер блокировки, нажмите кнопку просмотра.'; +$lang['js']['willexpire'] = 'Ваша блокировка этой страницы на редактирование истекает в течении минуты.\nЧтобы предотвратить конфликты используйте кнопку "Просмотр" для сброса таймера блокировки.'; $lang['js']['notsavedyet'] = 'Несохранённые изменения будут потеряны. Вы действительно хотите продолжить?'; $lang['js']['searchmedia'] = 'Поиск файлов'; $lang['js']['keepopen'] = 'Не закрывать окно после выбора'; @@ -143,22 +137,19 @@ $lang['js']['nosmblinks'] = 'Ссылка на сетевые катало $lang['js']['linkwiz'] = 'Мастер ссылок'; $lang['js']['linkto'] = 'Ссылка на:'; $lang['js']['del_confirm'] = 'Вы на самом деле желаете удалить выбранное?'; -$lang['js']['willexpire'] = 'Ваша блокировка этой страницы на редактирование истекает в течении минуты.\nЧтобы предотвратить конфликты используйте кнопку "Просмотр" для сброса таймера блокировки.'; -$lang['js']['restore_confirm'] = 'Действительно восстановить эту версию?'; -$lang['js']['media_diff'] = 'Просмотр отличий:'; -$lang['js']['media_diff_both'] = 'Рядом'; -$lang['js']['media_diff_opacity'] = 'Наложением'; +$lang['js']['restore_confirm'] = 'Действительно восстановить эту версию?'; +$lang['js']['media_diff'] = 'Просмотр отличий:'; +$lang['js']['media_diff_both'] = 'Рядом'; +$lang['js']['media_diff_opacity'] = 'Наложением'; $lang['js']['media_diff_portions'] = 'Частями'; -$lang['js']['media_select'] = 'Выбрать файлы…'; -$lang['js']['media_upload_btn'] = 'Загрузить'; -$lang['js']['media_done_btn'] = 'Готово'; -$lang['js']['media_drop'] = 'Переместите файлы сюда для загрузки'; -$lang['js']['media_cancel'] = 'отменить'; -$lang['js']['media_overwrt'] = 'Перезаписать существующие файлы'; - +$lang['js']['media_select'] = 'Выбрать файлы…'; +$lang['js']['media_upload_btn'] = 'Загрузить'; +$lang['js']['media_done_btn'] = 'Готово'; +$lang['js']['media_drop'] = 'Переместите файлы сюда для загрузки'; +$lang['js']['media_cancel'] = 'отменить'; +$lang['js']['media_overwrt'] = 'Перезаписать существующие файлы'; $lang['rssfailed'] = 'Произошла ошибка при получении следующей новостной ленты: '; $lang['nothingfound'] = 'Ничего не найдено.'; - $lang['mediaselect'] = 'Выбор медиафайла'; $lang['fileupload'] = 'Загрузка медиафайла'; $lang['uploadsucc'] = 'Загрузка произведена успешно'; @@ -183,7 +174,6 @@ $lang['mediaextchange'] = 'Расширение изменилось: с $lang['reference'] = 'Ссылки для'; $lang['ref_inuse'] = 'Этот файл не может быть удалён, так как он используется на следующих страницах:'; $lang['ref_hidden'] = 'Некоторые ссылки находятся на страницах, на чтение которых у вас нет прав доступа'; - $lang['hits'] = 'соответствий'; $lang['quickhits'] = 'Соответствия в названиях страниц'; $lang['toc'] = 'Содержание'; @@ -207,18 +197,20 @@ $lang['external_edit'] = 'внешнее изменение'; $lang['summary'] = 'Сводка изменений'; $lang['noflash'] = 'Для просмотра этого содержимого требуется Adobe Flash Plugin.'; $lang['download'] = 'Скачать код'; - +$lang['tools'] = 'Инструменты'; +$lang['user_tools'] = 'Инструменты пользователя'; +$lang['site_tools'] = 'Инструменты сайта'; +$lang['page_tools'] = 'Инструменты страницы'; +$lang['skip_to_content'] = 'Перейти к содержанию'; $lang['mail_newpage'] = 'страница добавлена:'; $lang['mail_changed'] = 'страница изменена:'; $lang['mail_subscribe_list'] = 'изменились страницы в пространстве имён:'; $lang['mail_new_user'] = 'новый пользователь:'; $lang['mail_upload'] = 'файл закачан:'; - $lang['changes_type'] = 'Посмотреть изменения'; $lang['pages_changes'] = 'Страниц'; $lang['media_changes'] = 'Медиа файлов'; $lang['both_changes'] = 'И страниц и медиа файлов'; - $lang['qb_bold'] = 'Полужирный'; $lang['qb_italic'] = 'Курсив'; $lang['qb_underl'] = 'Подчёркнутый'; @@ -243,11 +235,8 @@ $lang['qb_media'] = 'Добавить изображения или $lang['qb_sig'] = 'Вставить подпись'; $lang['qb_smileys'] = 'Смайлики'; $lang['qb_chars'] = 'Специальные символы'; - $lang['upperns'] = 'Перейти в родительское пространство имён'; - $lang['admin_register'] = 'Добавить пользователя'; - $lang['metaedit'] = 'Править метаданные'; $lang['metasaveerr'] = 'Ошибка записи метаданных'; $lang['metasaveok'] = 'Метаданные сохранены'; @@ -265,30 +254,24 @@ $lang['img_keywords'] = 'Ключевые слова'; $lang['img_width'] = 'Ширина'; $lang['img_height'] = 'Высота'; $lang['img_manager'] = 'Просмотр в media manager'; - -$lang['subscr_subscribe_success'] = 'Добавлен %s в подписку на %s'; -$lang['subscr_subscribe_error'] = 'Невозможно добавить %s в подписку на %s'; +$lang['subscr_subscribe_success'] = 'Добавлен %s в подписку на %s'; +$lang['subscr_subscribe_error'] = 'Невозможно добавить %s в подписку на %s'; $lang['subscr_subscribe_noaddress'] = 'Нет адреса электронной почты, сопоставленного с вашей учётной записью. Вы не можете подписаться на рассылку'; $lang['subscr_unsubscribe_success'] = 'Удалён %s из подписки на %s'; -$lang['subscr_unsubscribe_error'] = 'Ошибка удаления %s из подписки на %s'; -$lang['subscr_already_subscribed'] = '%s уже подписан на %s'; -$lang['subscr_not_subscribed'] = '%s не подписан на %s'; -// Manage page for subscriptions -$lang['subscr_m_not_subscribed'] = 'Вы не подписаны на текущую страницу или пространство имён.'; -$lang['subscr_m_new_header'] = 'Добавить подписку'; -$lang['subscr_m_current_header'] = 'Текущие подписки'; -$lang['subscr_m_unsubscribe'] = 'Отменить подписку'; -$lang['subscr_m_subscribe'] = 'Подписаться'; -$lang['subscr_m_receive'] = 'Получить'; -$lang['subscr_style_every'] = 'уведомлять о каждом изменении'; -$lang['subscr_style_digest'] = 'сводка изменений по каждой странице'; -$lang['subscr_style_list'] = 'перечислять изменившиеся страницы с прошлого уведомления'; - -/* auth.class language support */ +$lang['subscr_unsubscribe_error'] = 'Ошибка удаления %s из подписки на %s'; +$lang['subscr_already_subscribed'] = '%s уже подписан на %s'; +$lang['subscr_not_subscribed'] = '%s не подписан на %s'; +$lang['subscr_m_not_subscribed'] = 'Вы не подписаны на текущую страницу или пространство имён.'; +$lang['subscr_m_new_header'] = 'Добавить подписку'; +$lang['subscr_m_current_header'] = 'Текущие подписки'; +$lang['subscr_m_unsubscribe'] = 'Отменить подписку'; +$lang['subscr_m_subscribe'] = 'Подписаться'; +$lang['subscr_m_receive'] = 'Получить'; +$lang['subscr_style_every'] = 'уведомлять о каждом изменении'; +$lang['subscr_style_digest'] = 'сводка изменений по каждой странице'; +$lang['subscr_style_list'] = 'перечислять изменившиеся страницы с прошлого уведомления'; $lang['authmodfailed'] = 'Неправильная конфигурация аутентификации пользователя. Пожалуйста, сообщите об этом своему администратору вики.'; $lang['authtempfail'] = 'Аутентификация пользователей временно недоступна. Если проблема продолжается какое-то время, пожалуйста, сообщите об этом своему администратору вики.'; - -/* installer strings */ $lang['i_chooselang'] = 'Выберите свой язык/Choose your language'; $lang['i_installer'] = 'Установка «ДокуВики»'; $lang['i_wikiname'] = 'Название вики'; @@ -314,7 +297,6 @@ $lang['i_pol1'] = 'Общедоступная вики (чтен $lang['i_pol2'] = 'Закрытая вики (чтение, запись и загрузка файлов только для зарегистрированных пользователей)'; $lang['i_retry'] = 'Повторить попытку'; $lang['i_license'] = 'Пожалуйста, выберите тип лицензии для своей вики:'; - $lang['recent_global'] = 'Вы просматриваете изменения в пространстве имён %s. Вы можете также просмотреть недавние изменения во всей вики.'; $lang['years'] = '%d лет назад'; $lang['months'] = '%d месяц(ев) назад'; @@ -323,24 +305,29 @@ $lang['days'] = '%d дней назад'; $lang['hours'] = '%d час(ов) назад'; $lang['minutes'] = '%d минут назад'; $lang['seconds'] = '%d секунд назад'; - $lang['wordblock'] = 'Ваши изменения не сохранены, поскольку они содержат блокируемые слова (спам).'; - $lang['media_uploadtab'] = 'Загрузка'; $lang['media_searchtab'] = 'Поиск'; +$lang['media_file'] = 'Файл'; $lang['media_viewtab'] = 'Просмотр'; $lang['media_edittab'] = 'Правка'; $lang['media_historytab'] = 'История'; +$lang['media_list_thumbs'] = 'Миниатюры'; +$lang['media_list_rows'] = 'Строки'; $lang['media_sort_name'] = 'Сортировка по имени'; $lang['media_sort_date'] = 'Сортировка по дате'; +$lang['media_namespaces'] = 'Выберите каталог'; +$lang['media_files'] = 'Файлы в %s'; $lang['media_upload'] = 'Загрузка в пространство имён %s.'; $lang['media_search'] = 'Поиск в пространстве имён %s.'; $lang['media_view'] = '%s'; +$lang['media_viewold'] = '%s в %s +'; $lang['media_edit'] = 'Правка %s'; +$lang['media_history'] = 'История %s'; $lang['media_meta_edited'] = 'метаданные изменены'; $lang['media_perm_read'] = 'Извините, у Вас недостаточно прав для чтения файлов.'; $lang['media_perm_upload'] = 'Извините, у Вас недостаточно прав для загрузки файлов.'; $lang['media_update'] = 'Загрузить новую версию'; $lang['media_restore'] = 'Восстановить эту версию'; - -$lang['plugin_install_err'] = "Плагин установлен некорректно. Переименуйте папку плагина из '%s' в '%s'."; +$lang['plugin_install_err'] = 'Плагин установлен некорректно. Переименуйте папку плагина из \'%s\' в \'%s\'.'; diff --git a/lib/plugins/acl/lang/ru/lang.php b/lib/plugins/acl/lang/ru/lang.php index 6d04dde21..15ba78ef6 100644 --- a/lib/plugins/acl/lang/ru/lang.php +++ b/lib/plugins/acl/lang/ru/lang.php @@ -15,6 +15,7 @@ * @author Aleksandr Selivanov * @author Ladyko Andrey * @author Eugene + * @author Johnny Utah */ $lang['admin_acl'] = 'Управление списками контроля доступа'; $lang['acl_group'] = 'Группа'; diff --git a/lib/plugins/config/lang/ru/lang.php b/lib/plugins/config/lang/ru/lang.php index f29257a28..01cd1a8d5 100644 --- a/lib/plugins/config/lang/ru/lang.php +++ b/lib/plugins/config/lang/ru/lang.php @@ -16,6 +16,7 @@ * @author Aleksandr Selivanov * @author Ladyko Andrey * @author Eugene + * @author Johnny Utah */ $lang['menu'] = 'Настройки вики'; $lang['error'] = 'Настройки не были сохранены из-за ошибки в одном из значений. Пожалуйста, проверьте свои изменения и попробуйте ещё раз.
    Неправильные значения будут обведены красной рамкой.'; @@ -50,9 +51,12 @@ $lang['lang'] = 'Язык'; $lang['basedir'] = 'Корневая директория (например, /dokuwiki/). Оставьте пустым для автоопределения.'; $lang['baseurl'] = 'Корневой адрес (URL) (например, http://www.yourserver.ru). Оставьте пустым для автоопределения.'; $lang['savedir'] = 'Директория для данных'; +$lang['cookiedir'] = 'Cookie директория. Оставьте пустым для автоопределения.'; $lang['start'] = 'Имя стартовой страницы'; $lang['title'] = 'Название вики'; $lang['template'] = 'Шаблон'; +$lang['tagline'] = 'Слоган (если поддерживается шаблоном)'; +$lang['sidebar'] = 'Боковая панель, пустое поле отключает боковую панель.'; $lang['license'] = 'На условиях какой лицензии будет предоставляться содержимое вики?'; $lang['fullpath'] = 'Полный путь к документу'; $lang['recent'] = 'Недавние изменения (кол-во)'; @@ -73,6 +77,7 @@ $lang['useheading'] = 'Первый заголовок вместо $lang['refcheck'] = 'Проверять ссылки на медиафайлы'; $lang['refshow'] = 'Показывать ссылок на медиафайлы'; $lang['allowdebug'] = 'Включить отладку (отключите!)'; +$lang['mediarevisions'] = 'Включение версий медиафайлов'; $lang['usewordblock'] = 'Блокировать спам по ключевым словам'; $lang['indexdelay'] = 'Задержка перед индексированием'; $lang['relnofollow'] = 'rel="nofollow" для внешних ссылок'; @@ -120,6 +125,7 @@ $lang['jpg_quality'] = 'Качество сжатия JPG (0–100). $lang['subscribers'] = 'Разрешить подписку на изменения'; $lang['subscribe_time'] = 'Интервал рассылки подписок и сводок (сек.). Должен быть меньше, чем значение, указанное в recent_days.'; $lang['compress'] = 'Сжимать файлы CSS и javascript'; +$lang['cssdatauri'] = 'Размер в байтах до которого изображения, указанные в CSS-файлах, должны быть встроены прямо в таблицу стилей, для уменьшения избычтоных HTTP-запросов. Этот метод не будет работать в IE версии 7 и ниже! Установка от 400 до 600 байт является хорошим показателем. Установите 0, чтобы отключить.'; $lang['hidepages'] = 'Скрыть страницы (рег. выражение)'; $lang['send404'] = 'Посылать «HTTP404/Page Not Found»'; $lang['sitemap'] = 'Число дней, через которое нужно создавать (обновлять) карту сайта для поисковиков (Гугл, Яндекс и др.)'; diff --git a/lib/plugins/plugin/lang/ru/lang.php b/lib/plugins/plugin/lang/ru/lang.php index 757b607f5..f011c9954 100644 --- a/lib/plugins/plugin/lang/ru/lang.php +++ b/lib/plugins/plugin/lang/ru/lang.php @@ -16,6 +16,7 @@ * @author Aleksandr Selivanov * @author Ladyko Andrey * @author Eugene + * @author Johnny Utah */ $lang['menu'] = 'Управление плагинами'; $lang['download'] = 'Скачать и установить новый плагин'; @@ -61,3 +62,4 @@ $lang['enabled'] = 'Плагин %s включён.'; $lang['notenabled'] = 'Не удалось включить плагин %s. Проверьте системные права доступа к файлам.'; $lang['disabled'] = 'Плагин %s отключён.'; $lang['notdisabled'] = 'Не удалось отключить плагин %s. Проверьте системные права доступа к файлам.'; +$lang['packageinstalled'] = 'Пакет (%d плагин(а): %s) успешно установлен.'; diff --git a/lib/plugins/popularity/lang/ru/lang.php b/lib/plugins/popularity/lang/ru/lang.php index 79b3e224d..0e29c795d 100644 --- a/lib/plugins/popularity/lang/ru/lang.php +++ b/lib/plugins/popularity/lang/ru/lang.php @@ -13,6 +13,7 @@ * @author Aleksandr Selivanov * @author Ladyko Andrey * @author Eugene + * @author Johnny Utah */ $lang['name'] = 'Сбор информации о популярности (для загрузки может потребоваться некоторое время)'; $lang['submit'] = 'Отправить данные'; diff --git a/lib/plugins/revert/lang/ru/lang.php b/lib/plugins/revert/lang/ru/lang.php index 9624d8fd6..4abe37e6a 100644 --- a/lib/plugins/revert/lang/ru/lang.php +++ b/lib/plugins/revert/lang/ru/lang.php @@ -14,6 +14,7 @@ * @author Aleksandr Selivanov * @author Ladyko Andrey * @author Eugene + * @author Johnny Utah */ $lang['menu'] = 'Менеджер откаток'; $lang['filter'] = 'Поиск спам-страниц'; diff --git a/lib/plugins/usermanager/lang/ru/lang.php b/lib/plugins/usermanager/lang/ru/lang.php index 456ba5b29..eb9f26be6 100644 --- a/lib/plugins/usermanager/lang/ru/lang.php +++ b/lib/plugins/usermanager/lang/ru/lang.php @@ -16,6 +16,7 @@ * @author Aleksandr Selivanov * @author Ladyko Andrey * @author Eugene + * @author Johnny Utah */ $lang['menu'] = 'Управление пользователями'; $lang['noauth'] = '(авторизация пользователей недоступна)'; -- cgit v1.2.3 From e67004f5b686076af0dbf00cf574ac643d003cae Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Tue, 7 Feb 2012 19:41:09 +0100 Subject: trigger JS_CACHE_USE in lib/exe/js.php This removes the cachekey parameter again and instead follows @michitux's suggestion to trigger an event for the cache usage --- lib/exe/js.php | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/lib/exe/js.php b/lib/exe/js.php index c929c9ba5..95ca10e87 100644 --- a/lib/exe/js.php +++ b/lib/exe/js.php @@ -31,15 +31,9 @@ function js_out(){ global $lang; global $config_cascade; - if (isset($_GET['cacheKey'])) { - $cacheKey = strval($_GET['cacheKey']); - } else { - $cacheKey = ''; - } - // The generated script depends on some dynamic options - $cache = new cache('scripts'.$_SERVER['HTTP_HOST'].$_SERVER['SERVER_PORT'].$cacheKey, - '.js'); + $cache = new cache('scripts'.$_SERVER['HTTP_HOST'].$_SERVER['SERVER_PORT'],'.js'); + $cache->_event = 'JS_CACHE_USE'; // load minified version for some files $min = $conf['compress'] ? '.min' : ''; @@ -85,8 +79,8 @@ function js_out(){ // check cache age & handle conditional request // This may exit if a cache can be used - http_cached($cache->cache, - $cache->useCache(array('files' => $cache_files))); + $cache_ok = $cache->useCache(array('files' => $cache_files)); + http_cached($cache->cache, $cache_ok); // start output buffering and build the script ob_start(); -- cgit v1.2.3 From b2a1a44c2b1170a6fdbec637fa077c1469631511 Mon Sep 17 00:00:00 2001 From: Marius Olar Date: Tue, 7 Feb 2012 19:46:28 +0100 Subject: Romanian language update --- inc/lang/ro/lang.php | 2 +- lib/plugins/acl/lang/ro/lang.php | 2 +- lib/plugins/config/lang/ro/lang.php | 4 ++-- lib/plugins/plugin/lang/ro/lang.php | 2 +- lib/plugins/popularity/lang/ro/lang.php | 2 +- lib/plugins/revert/lang/ro/lang.php | 2 +- lib/plugins/usermanager/lang/ro/lang.php | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/inc/lang/ro/lang.php b/inc/lang/ro/lang.php index 96a3d7970..2159c8c53 100644 --- a/inc/lang/ro/lang.php +++ b/inc/lang/ro/lang.php @@ -8,7 +8,7 @@ * @author Emanuel-Emeric Andrași * @author Emanuel-Emeric Andraşi * @author Marius OLAR - * @author Emanuel-Emeric Andrași + * @author Marius Olar */ $lang['encoding'] = 'utf-8'; $lang['direction'] = 'ltr'; diff --git a/lib/plugins/acl/lang/ro/lang.php b/lib/plugins/acl/lang/ro/lang.php index 6d63ad024..c278c918e 100644 --- a/lib/plugins/acl/lang/ro/lang.php +++ b/lib/plugins/acl/lang/ro/lang.php @@ -9,7 +9,7 @@ * @author Emanuel-Emeric Andraşi * @author Emanuel-Emeric Andrasi * @author Marius OLAR - * @author Emanuel-Emeric Andrași + * @author Marius Olar */ $lang['admin_acl'] = 'Managementul Listei de Control a Accesului'; $lang['acl_group'] = 'Grup'; diff --git a/lib/plugins/config/lang/ro/lang.php b/lib/plugins/config/lang/ro/lang.php index 5845e3c35..dcdea8f77 100644 --- a/lib/plugins/config/lang/ro/lang.php +++ b/lib/plugins/config/lang/ro/lang.php @@ -9,7 +9,7 @@ * @author Emanuel-Emeric Andraşi * @author Emanuel-Emeric Andrasi * @author Marius OLAR - * @author Emanuel-Emeric Andrași + * @author Marius Olar */ $lang['menu'] = 'Setări de Configurare'; $lang['error'] = 'Setări nu au fost actualizate datorită unei valori incorecte; verificaţi modificările şi încercaţi din nou.
    Valorile incorecte vor apărea într-un chenar roşu.'; @@ -68,7 +68,7 @@ $lang['useheading'] = 'Foloseşte primul titlu pentru numele paginii' $lang['refcheck'] = 'Verificare referinţă media'; $lang['refshow'] = 'Numărul de referinţe media de arătat'; $lang['allowdebug'] = 'Permite depanarea dezactivaţi dacă cu e necesar!'; -$lang['mediarevisions'] = 'Activează revizii media?'; +$lang['mediarevisions'] = 'Activare Revizii Media?'; $lang['usewordblock'] = 'Blochează spam-ul pe baza listei de cuvinte'; $lang['indexdelay'] = 'Timpul de întârziere înainte de indexare (sec)'; $lang['relnofollow'] = 'Folosiţi rel="nofollow" pentru legăturile externe'; diff --git a/lib/plugins/plugin/lang/ro/lang.php b/lib/plugins/plugin/lang/ro/lang.php index 798ada1c7..50f6ca6f6 100644 --- a/lib/plugins/plugin/lang/ro/lang.php +++ b/lib/plugins/plugin/lang/ro/lang.php @@ -9,7 +9,7 @@ * @author Emanuel-Emeric Andraşi * @author Emanuel-Emeric Andrasi * @author Marius OLAR - * @author Emanuel-Emeric Andrași + * @author Marius Olar */ $lang['menu'] = 'Administrează plugin-uri'; $lang['download'] = 'Descarcă şi instalează un nou plugin'; diff --git a/lib/plugins/popularity/lang/ro/lang.php b/lib/plugins/popularity/lang/ro/lang.php index f3ca8d37e..9e9086b0d 100644 --- a/lib/plugins/popularity/lang/ro/lang.php +++ b/lib/plugins/popularity/lang/ro/lang.php @@ -7,7 +7,7 @@ * @author Emanuel-Emeric Andraşi * @author Emanuel-Emeric Andrasi * @author Marius OLAR - * @author Emanuel-Emeric Andrași + * @author Marius Olar */ $lang['name'] = 'Feedback de popularitate (încărcarea poate dura mai mult)'; $lang['submit'] = 'Trimite datele'; diff --git a/lib/plugins/revert/lang/ro/lang.php b/lib/plugins/revert/lang/ro/lang.php index 094f4dc71..f1fcf727c 100644 --- a/lib/plugins/revert/lang/ro/lang.php +++ b/lib/plugins/revert/lang/ro/lang.php @@ -9,7 +9,7 @@ * @author Emanuel-Emeric Andraşi * @author Emanuel-Emeric Andrasi * @author Marius OLAR - * @author Emanuel-Emeric Andrași + * @author Marius Olar */ $lang['menu'] = 'Manager Reveniri'; $lang['filter'] = 'Caută pagini cu posibil spam'; diff --git a/lib/plugins/usermanager/lang/ro/lang.php b/lib/plugins/usermanager/lang/ro/lang.php index b8c1f24fc..7aac6cfb0 100644 --- a/lib/plugins/usermanager/lang/ro/lang.php +++ b/lib/plugins/usermanager/lang/ro/lang.php @@ -9,7 +9,7 @@ * @author Emanuel-Emeric Andraşi * @author Emanuel-Emeric Andrasi * @author Marius OLAR - * @author Emanuel-Emeric Andrași + * @author Marius Olar */ $lang['menu'] = 'Manager Utilizatori'; $lang['noauth'] = '(autentificarea utilizatorilor nu este disponibilă)'; -- cgit v1.2.3 From a699035c4f7aa040cc4170401b2f9c48966eba5b Mon Sep 17 00:00:00 2001 From: Erial Krale Date: Wed, 15 Feb 2012 23:30:22 +0100 Subject: Korean language update --- inc/lang/ko/lang.php | 54 ++++++++++++++++++++++++++++++-- lib/plugins/acl/lang/ko/lang.php | 1 + lib/plugins/config/lang/ko/lang.php | 6 ++++ lib/plugins/plugin/lang/ko/lang.php | 1 + lib/plugins/popularity/lang/ko/lang.php | 1 + lib/plugins/revert/lang/ko/lang.php | 1 + lib/plugins/usermanager/lang/ko/lang.php | 1 + 7 files changed, 63 insertions(+), 2 deletions(-) diff --git a/inc/lang/ko/lang.php b/inc/lang/ko/lang.php index b0664e7f4..bcf2dbbf9 100644 --- a/inc/lang/ko/lang.php +++ b/inc/lang/ko/lang.php @@ -8,6 +8,7 @@ * @author dongnak@gmail.com * @author Song Younghwan * @author Seung-Chul Yoo + * @author erial2@gmail.com */ $lang['encoding'] = 'utf-8'; $lang['direction'] = 'ltr'; @@ -49,7 +50,9 @@ $lang['btn_recover'] = '문서초안 복구'; $lang['btn_draftdel'] = '문서초안 삭제'; $lang['btn_revert'] = '복원'; $lang['btn_register'] = '등록'; -$lang['loggedinas'] = '다음 사용자로 로그인'; +$lang['btn_apply'] = '적용'; +$lang['btn_media'] = '미디어 관리'; +$lang['loggedinas'] = '다른 사용자로 로그인'; $lang['user'] = '사용자'; $lang['pass'] = '패스워드'; $lang['newpass'] = '새로운 패스워드'; @@ -93,7 +96,7 @@ $lang['txt_filename'] = '업로드 파일 이름을 입력합니다.( $lang['txt_overwrt'] = '새로운 파일로 이전 파일을 교체합니다.'; $lang['lockedby'] = '현재 잠금 사용자'; $lang['lockexpire'] = '잠금 해제 시간'; -$lang['js']['willexpire'] = '잠시 후 편집 잠금이 해제됩니다.\n편집 충돌을 피하려면 미리보기를 눌러 잠금 시간을 다시 설정하기 바랍니다.'; +$lang['js']['willexpire'] = '잠시 후 편집 잠금이 해제됩니다.\n편집 충돌을 피하려면 미리보기를 눌러 잠금 시간을 다시 설정하기 바랍니다.'; $lang['js']['notsavedyet'] = '저장하지 않은 변경은 지워집니다. 계속하시겠습니까?'; $lang['js']['searchmedia'] = '파일 찾기'; @@ -125,6 +128,17 @@ $lang['js']['nosmblinks'] = '윈도우 공유 파일과의 연결은 MS 인 $lang['js']['linkwiz'] = '링크 마법사'; $lang['js']['linkto'] = '다음으로 연결:'; $lang['js']['del_confirm'] = '정말로 선택된 항목(들)을 삭제하시겠습니까?'; +$lang['js']['restore_confirm'] = '정말 이 버전으로 되돌리시겠습니까?'; +$lang['js']['media_diff'] = '차이점 보기 :'; +$lang['js']['media_diff_both'] = '나란히 보기'; +$lang['js']['media_diff_opacity'] = '겹쳐 보기'; +$lang['js']['media_diff_portions'] = '쪼개 보기'; +$lang['js']['media_select'] = '파일 선택'; +$lang['js']['media_upload_btn'] = '업로드'; +$lang['js']['media_done_btn'] = '완료'; +$lang['js']['media_drop'] = '업로드할 파일을 끌어넣으세요'; +$lang['js']['media_cancel'] = '삭제'; +$lang['js']['media_overwrt'] = '이미있는 파일 덮어쓰기'; $lang['rssfailed'] = 'feed 가져오기 실패: '; $lang['nothingfound'] = '아무 것도 없습니다.'; $lang['mediaselect'] = '미디어 파일 선택'; @@ -174,11 +188,20 @@ $lang['external_edit'] = '외부 편집기'; $lang['summary'] = '편집 요약'; $lang['noflash'] = '이 컨텐츠를 표시하기 위해서 Adobe Flash Plugin이 필요합니다.'; $lang['download'] = '조각 다운로드'; +$lang['tools'] = '도구'; +$lang['user_tools'] = '사용자 도구'; +$lang['site_tools'] = '사이트 도구'; +$lang['page_tools'] = '페이지 도구'; +$lang['skip_to_content'] = '컨텐츠 넘기기'; $lang['mail_newpage'] = '페이지 추가:'; $lang['mail_changed'] = '페이지 변경:'; $lang['mail_subscribe_list'] = '네임스페이스에서 변경된 페이지:'; $lang['mail_new_user'] = '새로운 사용자:'; $lang['mail_upload'] = '파일 첨부:'; +$lang['changes_type'] = '차이점 보기'; +$lang['pages_changes'] = '페이지'; +$lang['media_changes'] = '미디어 파일'; +$lang['both_changes'] = '미디어 파일과 페이지 양쪽'; $lang['qb_bold'] = '굵은 글'; $lang['qb_italic'] = '이탤릭체 글'; $lang['qb_underl'] = '밑줄 그어진 글'; @@ -219,6 +242,9 @@ $lang['img_copyr'] = '저작권'; $lang['img_format'] = '포맷'; $lang['img_camera'] = '카메라'; $lang['img_keywords'] = '키워드'; +$lang['img_width'] = '너비'; +$lang['img_height'] = '높이'; +$lang['img_manager'] = '미디어 관리자에서 보기'; $lang['subscr_subscribe_success'] = '%s을(를) 구독목록 %s에 추가하였습니다'; $lang['subscr_subscribe_error'] = '%s을(를) 구독목록 %s에 추가하는데 실패했습니다'; $lang['subscr_subscribe_noaddress'] = '등록된 주소가 없기 때문에 구독목록에 등록되지 않았습니다'; @@ -271,3 +297,27 @@ $lang['hours'] = '%d 시간 전'; $lang['minutes'] = '%d 분 전'; $lang['seconds'] = '%d 초 전'; $lang['wordblock'] = '스팸 문구를 포함하고 있어서 저장되지 않았습니다.'; +$lang['media_uploadtab'] = '업로드'; +$lang['media_searchtab'] = '검색'; +$lang['media_file'] = '파일'; +$lang['media_viewtab'] = '보기'; +$lang['media_edittab'] = '수정'; +$lang['media_historytab'] = '변경사항'; +$lang['media_list_thumbs'] = '썸네일'; +$lang['media_list_rows'] = '목록'; +$lang['media_sort_name'] = '이름'; +$lang['media_sort_date'] = '날짜'; +$lang['media_namespaces'] = '네임스페이스 선택'; +$lang['media_files'] = '%s 의 파일'; +$lang['media_upload'] = '%s 에 업로드'; +$lang['media_search'] = '%s 를 검색'; +$lang['media_view'] = '%s'; +$lang['media_viewold'] = '%s 의 %s'; +$lang['media_edit'] = '%s 수정'; +$lang['media_history'] = '%s 변경사항'; +$lang['media_meta_edited'] = '메타데이터 수정됨'; +$lang['media_perm_read'] = '죄송합니다, 이 파일을 읽을 권한이 없습니다.'; +$lang['media_perm_upload'] = '죄송합니다. 파일을 업로드할 권한이 없습니다.'; +$lang['media_update'] = '새 버전 올리기'; +$lang['media_restore'] = '이 버전으로 되돌리기'; +$lang['plugin_install_err'] = '플러그인 설치가 비정상적으로 이뤄졌습니다. 플러그인 디렉토리 \'%s\'를 \'%s\'로 변경하십시오.'; diff --git a/lib/plugins/acl/lang/ko/lang.php b/lib/plugins/acl/lang/ko/lang.php index 6f4e991cb..6b1e77cf8 100644 --- a/lib/plugins/acl/lang/ko/lang.php +++ b/lib/plugins/acl/lang/ko/lang.php @@ -11,6 +11,7 @@ * @author Song Younghwan * @author SONG Younghwan * @author Seung-Chul Yoo + * @author erial2@gmail.com */ $lang['admin_acl'] = '접근 제어 목록 관리'; $lang['acl_group'] = '그룹'; diff --git a/lib/plugins/config/lang/ko/lang.php b/lib/plugins/config/lang/ko/lang.php index 20cfcdcfe..e71b9e3a4 100644 --- a/lib/plugins/config/lang/ko/lang.php +++ b/lib/plugins/config/lang/ko/lang.php @@ -8,6 +8,7 @@ * @author Song Younghwan * @author SONG Younghwan * @author Seung-Chul Yoo + * @author erial2@gmail.com */ $lang['menu'] = '환경 설정'; $lang['error'] = '잘못된 값때문에 설정들을 변경할 수 없습니다. 수정한 값들을 검사하고 확인을 누르기 바랍니다. @@ -43,9 +44,12 @@ $lang['lang'] = '언어'; $lang['basedir'] = '기본 디렉토리'; $lang['baseurl'] = '기본 URL'; $lang['savedir'] = '데이타 저장 디렉토리'; +$lang['cookiedir'] = '쿠키 위치. 비워두면 기본 url 위치로 지정됩니다.'; $lang['start'] = '시작 페이지 이름'; $lang['title'] = '위키 제목'; $lang['template'] = '템플릿'; +$lang['tagline'] = '태그 라인 (템플릿이 지원할 때에 한해)'; +$lang['sidebar'] = '사이드바 페이지 이름(템플릿이 지원할 때에 한해). 비워두면 사이드바를 비활성화함'; $lang['license'] = '컨텐트에 어떤 라이센스 정책을 적용하시겠습니까?'; $lang['fullpath'] = '페이지 하단에 전체 경로 보여주기'; $lang['recent'] = '최근에 바뀐 것'; @@ -66,6 +70,7 @@ $lang['useheading'] = '페이지 이름으로 첫 헤드라인 사용 $lang['refcheck'] = '미디어 참조 검사'; $lang['refshow'] = '보여줄 미디어 참조 수'; $lang['allowdebug'] = '디버그 허용 필요하지 않으면 금지!'; +$lang['mediarevisions'] = '미디어 버전 관리를 사용하시겠습니까?'; $lang['usewordblock'] = '금지단어를 사용해 스팸 막기'; $lang['indexdelay'] = '색인 연기 시간(초)'; $lang['relnofollow'] = '외부 링크에 rel="nofollow" 사용'; @@ -115,6 +120,7 @@ $lang['jpg_quality'] = 'JPG 압축 품질 (0-100)'; $lang['subscribers'] = '페이지 갱신 알람 기능'; $lang['subscribe_time'] = ' 구독 목록과 요약이 보내질 경과 시간 (초); 이 것은 recent_days에서 설정된 시간보다 작아야 합니다.'; $lang['compress'] = '최적화된 CSS, javascript 출력'; +$lang['cssdatauri'] = '이미지가 렌더링될 최대 용량 크기를 CSS에 규정해야 HTTP request 헤더 오버헤드 크기를 감소시킬 수 있습니다. 이 기술은 IE 7 이하에서는 작동하지 않습니다! 400 에서 600> 정도면 좋은 효율을 가져옵니다. 0로 지정할 경우 비활성화 됩니다.'; $lang['hidepages'] = '매칭된 페이지 숨기기(정규표현식)'; $lang['send404'] = '존재하지 않는 페이지에 대해 "HTTP 404/Page Not Found" 응답'; $lang['sitemap'] = '구글 사이트맵 생성(날짜)'; diff --git a/lib/plugins/plugin/lang/ko/lang.php b/lib/plugins/plugin/lang/ko/lang.php index c77c3259d..b15b377a6 100644 --- a/lib/plugins/plugin/lang/ko/lang.php +++ b/lib/plugins/plugin/lang/ko/lang.php @@ -8,6 +8,7 @@ * @author Song Younghwan * @author SONG Younghwan * @author Seung-Chul Yoo + * @author erial2@gmail.com */ $lang['menu'] = '플러그인 관리자'; $lang['download'] = '새로운 플러그인 다운로드 및 설치'; diff --git a/lib/plugins/popularity/lang/ko/lang.php b/lib/plugins/popularity/lang/ko/lang.php index 0f1442d53..01bc51044 100644 --- a/lib/plugins/popularity/lang/ko/lang.php +++ b/lib/plugins/popularity/lang/ko/lang.php @@ -7,6 +7,7 @@ * @author Song Younghwan * @author SONG Younghwan * @author Seung-Chul Yoo + * @author erial2@gmail.com */ $lang['name'] = '인기도 조사 (불러오는데 시간이 걸릴 수 있습니다.)'; $lang['submit'] = '자료 보내기'; diff --git a/lib/plugins/revert/lang/ko/lang.php b/lib/plugins/revert/lang/ko/lang.php index 0163d2754..da689c788 100644 --- a/lib/plugins/revert/lang/ko/lang.php +++ b/lib/plugins/revert/lang/ko/lang.php @@ -7,6 +7,7 @@ * @author Song Younghwan * @author SONG Younghwan * @author Seung-Chul Yoo + * @author erial2@gmail.com */ $lang['menu'] = '복구 관리자'; $lang['filter'] = '스팸 페이지 검색 '; diff --git a/lib/plugins/usermanager/lang/ko/lang.php b/lib/plugins/usermanager/lang/ko/lang.php index f2322414a..111267e5f 100644 --- a/lib/plugins/usermanager/lang/ko/lang.php +++ b/lib/plugins/usermanager/lang/ko/lang.php @@ -7,6 +7,7 @@ * @author Song Younghwan * @author SONG Younghwan * @author Seung-Chul Yoo + * @author erial2@gmail.com */ $lang['menu'] = '사용자 관리자'; $lang['noauth'] = '(사용자 인증이 불가능합니다.)'; -- cgit v1.2.3 From 69995a164f9dbb51adfe17f09901e0200ea8dc7a Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Fri, 17 Feb 2012 13:39:38 +0100 Subject: do not hardcode profile link in AD pass expire message Changing passwords might not be available. --- inc/auth/ad.class.php | 8 +++++++- inc/lang/de/lang.php | 2 +- inc/lang/en/lang.php | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/inc/auth/ad.class.php b/inc/auth/ad.class.php index cb59c5a48..dc1fef17a 100644 --- a/inc/auth/ad.class.php +++ b/inc/auth/ad.class.php @@ -149,6 +149,7 @@ class auth_ad extends auth_basic { function getUserData($user){ global $conf; global $lang; + global $ID; if(!$this->_init()) return false; if($user == '') return array(); @@ -206,7 +207,12 @@ class auth_ad extends auth_basic { // if this is the current user, warn him if( ($_SERVER['REMOTE_USER'] == $user) && ($timeleft <= $this->cnf['expirywarn'])){ - msg(sprintf($lang['authpwdexpire'],$timeleft)); + $msg = sprintf($lang['authpwdexpire'],$timeleft); + if($this->canDo('modPass')){ + $url = wl($ID,array('do'=>'profile')); + $msg .= ' '.$lang['btn_profile'].''; + } + msg($msg); } } diff --git a/inc/lang/de/lang.php b/inc/lang/de/lang.php index 8fdffd66e..c7b2d7893 100644 --- a/inc/lang/de/lang.php +++ b/inc/lang/de/lang.php @@ -268,7 +268,7 @@ $lang['subscr_style_digest'] = 'Zusammenfassung der Änderungen für jede ver $lang['subscr_style_list'] = 'Liste der geänderten Seiten (Alle %.2f Tage)'; $lang['authmodfailed'] = 'Benutzerüberprüfung nicht möglich. Bitte wenden Sie sich an den Systembetreuer.'; $lang['authtempfail'] = 'Benutzerüberprüfung momentan nicht möglich. Falls das Problem andauert, wenden Sie sich an den Systembetreuer.'; -$lang['authpwdexpire'] = 'Ihr Passwort läuft in %d Tag(en) ab. Sie sollten es ändern.'; +$lang['authpwdexpire'] = 'Ihr Passwort läuft in %d Tag(en) ab, Sie sollten es bald ändern.'; $lang['i_chooselang'] = 'Wählen Sie Ihre Sprache'; $lang['i_installer'] = 'DokuWiki Installation'; $lang['i_wikiname'] = 'Wiki-Name'; diff --git a/inc/lang/en/lang.php b/inc/lang/en/lang.php index 9250d119a..5c8628da5 100644 --- a/inc/lang/en/lang.php +++ b/inc/lang/en/lang.php @@ -275,7 +275,7 @@ $lang['subscr_style_list'] = 'list of changed pages since last email (e /* auth.class language support */ $lang['authmodfailed'] = 'Bad user authentication configuration. Please inform your Wiki Admin.'; $lang['authtempfail'] = 'User authentication is temporarily unavailable. If this situation persists, please inform your Wiki Admin.'; -$lang['authpwdexpire'] = 'Your password will expire in %d days. You should change it.'; +$lang['authpwdexpire'] = 'Your password will expire in %d days, you should change it soon.'; /* installer strings */ $lang['i_chooselang'] = 'Choose your language'; -- cgit v1.2.3 From 1e5105f90f56d0f57111eff37a535480115920c5 Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Fri, 17 Feb 2012 13:42:39 +0100 Subject: make sure AD pass expiry message is never shown twice --- inc/auth/ad.class.php | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/inc/auth/ad.class.php b/inc/auth/ad.class.php index dc1fef17a..cc080dc93 100644 --- a/inc/auth/ad.class.php +++ b/inc/auth/ad.class.php @@ -46,6 +46,7 @@ class auth_ad extends auth_basic { var $opts = null; var $adldap = null; var $users = null; + var $msgshown = false; /** * Constructor @@ -205,14 +206,18 @@ class auth_ad extends auth_basic { $timeleft = round($timeleft/(24*60*60)); $info['expiresin'] = $timeleft; - // if this is the current user, warn him - if( ($_SERVER['REMOTE_USER'] == $user) && ($timeleft <= $this->cnf['expirywarn'])){ + // if this is the current user, warn him (once per request only) + if( ($_SERVER['REMOTE_USER'] == $user) && + ($timeleft <= $this->cnf['expirywarn']) && + !$this->msgshown + ){ $msg = sprintf($lang['authpwdexpire'],$timeleft); if($this->canDo('modPass')){ $url = wl($ID,array('do'=>'profile')); $msg .= ' '.$lang['btn_profile'].''; } msg($msg); + $this->msgshown = true; } } -- cgit v1.2.3 From 7cb9c0e3233fdc295a05e410a1d7a731301bc2da Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Fri, 17 Feb 2012 14:06:34 +0100 Subject: removed outdated language string. it has to be retranslated --- inc/lang/af/lang.php | 2 -- inc/lang/ar/lang.php | 2 -- inc/lang/az/lang.php | 2 -- inc/lang/bg/lang.php | 2 -- inc/lang/ca-valencia/lang.php | 2 -- inc/lang/ca/lang.php | 2 -- inc/lang/cs/lang.php | 2 -- inc/lang/da/lang.php | 2 -- inc/lang/el/lang.php | 2 -- inc/lang/eo/lang.php | 2 -- inc/lang/es/lang.php | 2 -- inc/lang/et/lang.php | 2 -- inc/lang/eu/lang.php | 2 -- inc/lang/fa/lang.php | 2 -- inc/lang/fi/lang.php | 2 -- inc/lang/fo/lang.php | 2 -- inc/lang/fr/lang.php | 2 -- inc/lang/gl/lang.php | 2 -- inc/lang/he/lang.php | 2 -- inc/lang/hi/lang.php | 1 - inc/lang/hr/lang.php | 2 -- inc/lang/hu/lang.php | 2 -- inc/lang/ia/lang.php | 2 -- inc/lang/id-ni/lang.php | 2 -- inc/lang/id/lang.php | 2 -- inc/lang/is/lang.php | 2 -- inc/lang/it/lang.php | 2 -- inc/lang/ja/lang.php | 2 -- inc/lang/kk/lang.php | 2 -- inc/lang/km/lang.php | 2 -- inc/lang/ko/lang.php | 2 -- inc/lang/la/lang.php | 2 -- inc/lang/lb/lang.php | 2 -- inc/lang/lt/lang.php | 2 -- inc/lang/lv/lang.php | 2 -- inc/lang/mk/lang.php | 2 -- inc/lang/mr/lang.php | 2 -- inc/lang/ne/lang.php | 2 -- inc/lang/nl/lang.php | 2 -- inc/lang/no/lang.php | 2 -- inc/lang/pl/lang.php | 2 -- inc/lang/pt-br/lang.php | 2 -- inc/lang/pt/lang.php | 2 -- inc/lang/ro/lang.php | 2 -- inc/lang/ru/lang.php | 2 -- inc/lang/sk/lang.php | 2 -- inc/lang/sl/lang.php | 2 -- inc/lang/sq/lang.php | 2 -- inc/lang/sr/lang.php | 2 -- inc/lang/sv/lang.php | 2 -- inc/lang/th/lang.php | 2 -- inc/lang/tr/lang.php | 2 -- inc/lang/uk/lang.php | 2 -- inc/lang/zh-tw/lang.php | 2 -- inc/lang/zh/lang.php | 2 -- 55 files changed, 109 deletions(-) diff --git a/inc/lang/af/lang.php b/inc/lang/af/lang.php index 6665196f4..54e5cfc9d 100644 --- a/inc/lang/af/lang.php +++ b/inc/lang/af/lang.php @@ -25,7 +25,6 @@ $lang['btn_back'] = 'Terug'; $lang['btn_backlink'] = 'Wat skakel hierheen'; $lang['btn_subscribe'] = 'Hou bladsy dop'; $lang['btn_unsubscribe'] = 'Verwyder van bladsy dophoulys'; -$lang['btn_resendpwd'] = 'E-pos nuwe wagwoord'; $lang['btn_register'] = 'Skep gerus \'n rekening'; $lang['loggedinas'] = 'Ingeteken as'; $lang['user'] = 'Gebruikernaam'; @@ -43,7 +42,6 @@ $lang['regsuccess2'] = 'Rekening geskep'; $lang['regbadpass'] = 'Die ingetikte wagwoorde is nie dieselfde nie.'; $lang['regpwmail'] = 'Jo DokuWiki wagwoord'; $lang['profnoempty'] = 'Jy moet \'n name en a e-posadres in sit'; -$lang['resendpwd'] = 'Stuir vir a niwe wagwoord'; $lang['resendpwdmissing'] = 'Jammer, jy moet ales in fil'; $lang['resendpwdconfirm'] = '\'n Bevestigingpos is gestuur na die gekose e-posadres.'; $lang['resendpwdsuccess'] = 'Jou nuive wagwoord was deur e-pos gesteur'; diff --git a/inc/lang/ar/lang.php b/inc/lang/ar/lang.php index 02a62fe94..fe1f043b0 100644 --- a/inc/lang/ar/lang.php +++ b/inc/lang/ar/lang.php @@ -42,7 +42,6 @@ $lang['btn_backtomedia'] = 'ارجع إلى اختيار ملف الوسا $lang['btn_subscribe'] = 'ادر الاشتراكات'; $lang['btn_profile'] = 'حدث الملف الشخصي'; $lang['btn_reset'] = 'صفّر'; -$lang['btn_resendpwd'] = 'ارسل كلمة سر جديدة'; $lang['btn_draft'] = 'حرر المسودة'; $lang['btn_recover'] = 'استرجع المسودة'; $lang['btn_draftdel'] = 'احذف المسوّدة'; @@ -77,7 +76,6 @@ $lang['profnoempty'] = 'غير مسموح باسم مستخدم أو $lang['profchanged'] = 'حُدث الملف الشخصي للمستخدم بنجاح.'; $lang['pwdforget'] = 'أنسيت كلمة السر؟ احصل على واحدة جديدة'; $lang['resendna'] = 'هذه الويكي لا تدعم إعادة إرسال كلمة المرور.'; -$lang['resendpwd'] = 'إرسال كلمة مرور'; $lang['resendpwdmissing'] = 'عذراّ، يجب أن تملأ كل الحقول.'; $lang['resendpwdnouser'] = 'عذراً، لم نجد المستخدم هذا في قاعدة بياناتنا.'; $lang['resendpwdbadauth'] = 'عذراً، رمز التفعيل هذا غير صحيح. نأكد من استخدامك كامل وصلة التأكيد.'; diff --git a/inc/lang/az/lang.php b/inc/lang/az/lang.php index 13ba7b3c3..a1f9c172b 100644 --- a/inc/lang/az/lang.php +++ b/inc/lang/az/lang.php @@ -40,7 +40,6 @@ $lang['btn_subscribe'] = 'Abunə ol (bütün dəyişiklər)'; $lang['btn_unsubscribe'] = 'Abunəlikdən çıx (bütün dəyişiklər)'; $lang['btn_profile'] = 'Profil'; $lang['btn_reset'] = 'Boşalt'; -$lang['btn_resendpwd'] = 'Yeni şifrəni göndər'; $lang['btn_draft'] = 'Qaralamada düzəliş etmək'; $lang['btn_recover'] = 'Qaralamanı qaytar'; $lang['btn_draftdel'] = 'Qaralamanı sil'; @@ -75,7 +74,6 @@ $lang['profnoempty'] = 'istifadəci adı və e-mail ünvanı boş ola $lang['profchanged'] = 'İstifadəçi profili uğurla yeniləndi.'; $lang['pwdforget'] = 'Şifrəni yaddan çıxartmısız? Buyurun yenisini əldə edin'; $lang['resendna'] = 'Bu wiki şifrəni yenidən göndərməyi dəstəkləmir.'; -$lang['resendpwd'] = 'Yeni şifrəni göndər:'; $lang['resendpwdmissing'] = 'Formanın bütün xanəlırini doldurun.'; $lang['resendpwdnouser'] = 'Verilənlər bazasında bu ad ilə istifadəçi tapılmadı.'; $lang['resendpwdbadauth'] = 'Ativləşdirmə kodu səhvdir. Link-i tam olaraq köçürdüyünüzü yoxlayın. '; diff --git a/inc/lang/bg/lang.php b/inc/lang/bg/lang.php index 8985e20e5..fee3505a0 100644 --- a/inc/lang/bg/lang.php +++ b/inc/lang/bg/lang.php @@ -41,7 +41,6 @@ $lang['btn_backtomedia'] = 'Назад към избора на файл'; $lang['btn_subscribe'] = 'Абонаменти'; $lang['btn_profile'] = 'Профил'; $lang['btn_reset'] = 'Изчистване'; -$lang['btn_resendpwd'] = 'Пращане на нова парола'; $lang['btn_draft'] = 'Редактиране на чернова'; $lang['btn_recover'] = 'Възстановяване на чернова'; $lang['btn_draftdel'] = 'Изтриване на чернова'; @@ -78,7 +77,6 @@ $lang['profnoempty'] = 'Въвеждането на име и ел. п $lang['profchanged'] = 'Потребителският профил е обновен успешно.'; $lang['pwdforget'] = 'Забравили сте паролата си? Получете нова'; $lang['resendna'] = 'Wiki-то не поддържа повторно пращане на паролата.'; -$lang['resendpwd'] = 'Изпращане на нова парола за'; $lang['resendpwdmissing'] = 'Моля, попълнете всички полета.'; $lang['resendpwdnouser'] = 'Потребителят не е намерен в базата от данни.'; $lang['resendpwdbadauth'] = 'Кодът за потвърждение е невалиден. Проверете дали сте използвали целия линк за потвърждение.'; diff --git a/inc/lang/ca-valencia/lang.php b/inc/lang/ca-valencia/lang.php index eac9fc8d1..e7b653bab 100644 --- a/inc/lang/ca-valencia/lang.php +++ b/inc/lang/ca-valencia/lang.php @@ -41,7 +41,6 @@ $lang['btn_subscribe'] = 'Subscriure\'s a la pàgina'; $lang['btn_unsubscribe'] = 'Desubscriure\'s de la pàgina'; $lang['btn_profile'] = 'Actualisar perfil'; $lang['btn_reset'] = 'Reiniciar'; -$lang['btn_resendpwd'] = 'Enviar contrasenya nova'; $lang['btn_draft'] = 'Editar borrador'; $lang['btn_recover'] = 'Recuperar borrador'; $lang['btn_draftdel'] = 'Borrar borrador'; @@ -76,7 +75,6 @@ $lang['profnoempty'] = 'No es permet deixar el nom o la direcció de c $lang['profchanged'] = 'Perfil de l\'usuari actualisat.'; $lang['pwdforget'] = '¿Ha oblidat la contrasenya? Demane\'n una nova'; $lang['resendna'] = 'Este wiki no permet reenviar la contrasenya.'; -$lang['resendpwd'] = 'Enviar contrasenya nova per a'; $lang['resendpwdmissing'] = 'Disculpe, pero deu omplir tots els camps.'; $lang['resendpwdnouser'] = 'Disculpe, pero no trobem ad est usuari en la base de senyes.'; $lang['resendpwdbadauth'] = 'Disculpe, pero este còdic d\'autenticació no es vàlit. Verifique que haja utilisat el víncul de confirmació sancer.'; diff --git a/inc/lang/ca/lang.php b/inc/lang/ca/lang.php index 7094df5b4..a689316b6 100644 --- a/inc/lang/ca/lang.php +++ b/inc/lang/ca/lang.php @@ -41,7 +41,6 @@ $lang['btn_subscribe'] = 'Subscripció a canvis d\'aquesta pàgina'; $lang['btn_unsubscribe'] = 'Cancel·la subscripció a pàgina'; $lang['btn_profile'] = 'Actualització del perfil'; $lang['btn_reset'] = 'Reinicia'; -$lang['btn_resendpwd'] = 'Envia nova contrasenya'; $lang['btn_draft'] = 'Edita esborrany'; $lang['btn_recover'] = 'Recupera esborrany'; $lang['btn_draftdel'] = 'Suprimeix esborrany'; @@ -76,7 +75,6 @@ $lang['profnoempty'] = 'No es pot deixar en blanc el nom o l\'adreça $lang['profchanged'] = 'El perfil d\'usuari s\'ha actualitzat correctament.'; $lang['pwdforget'] = 'Heu oblidat la contrasenya? Podeu obtenir-ne una de nova.'; $lang['resendna'] = 'Aquest wiki no permet tornar a enviar la contrasenya.'; -$lang['resendpwd'] = 'Enviament d\'una nova contrasenya per a'; $lang['resendpwdmissing'] = 'Heu d\'emplenar tots els camps.'; $lang['resendpwdnouser'] = 'No s\'ha pogut trobar aquest usuari a la base de dades.'; $lang['resendpwdbadauth'] = 'Aquest codi d\'autenticació no és vàlid. Assegureu-vos d\'utilitzar l\'enllaç de confirmació complet.'; diff --git a/inc/lang/cs/lang.php b/inc/lang/cs/lang.php index 292c2c42e..ac95c1456 100644 --- a/inc/lang/cs/lang.php +++ b/inc/lang/cs/lang.php @@ -45,7 +45,6 @@ $lang['btn_backtomedia'] = 'Zpět do Výběru dokumentu'; $lang['btn_subscribe'] = 'Odebírat emailem změny stránky'; $lang['btn_profile'] = 'Upravit profil'; $lang['btn_reset'] = 'Reset'; -$lang['btn_resendpwd'] = 'Zaslat nové heslo'; $lang['btn_draft'] = 'Upravit koncept'; $lang['btn_recover'] = 'Obnovit koncept'; $lang['btn_draftdel'] = 'Vymazat koncept'; @@ -80,7 +79,6 @@ $lang['profnoempty'] = 'Nelze zadat prázdné jméno nebo mailová adr $lang['profchanged'] = 'Uživatelský profil změněn.'; $lang['pwdforget'] = 'Zapomněli jste heslo? Nechte si zaslat nové'; $lang['resendna'] = 'Tato wiki neumožňuje zasílání nových hesel.'; -$lang['resendpwd'] = 'Odeslat nové heslo pro uživatele'; $lang['resendpwdmissing'] = 'Musíte vyplnit všechny položky.'; $lang['resendpwdnouser'] = 'Bohužel takový uživatel v systému není.'; $lang['resendpwdbadauth'] = 'Autorizační kód není platný. Zadali jste opravdu celý odkaz na potvrzovací stránku?'; diff --git a/inc/lang/da/lang.php b/inc/lang/da/lang.php index 0b6961921..582687293 100644 --- a/inc/lang/da/lang.php +++ b/inc/lang/da/lang.php @@ -48,7 +48,6 @@ $lang['btn_backtomedia'] = 'Tilbage til valg af mediefil'; $lang['btn_subscribe'] = 'Abonnér på ændringer'; $lang['btn_profile'] = 'Opdatér profil'; $lang['btn_reset'] = 'Nulstil'; -$lang['btn_resendpwd'] = 'Send ny adgangskode'; $lang['btn_draft'] = 'Redigér kladde'; $lang['btn_recover'] = 'Gendan kladde'; $lang['btn_draftdel'] = 'Slet kladde'; @@ -83,7 +82,6 @@ $lang['profnoempty'] = 'Tomt navn eller e-mail adresse er ikke tilladt $lang['profchanged'] = 'Brugerprofil opdateret korrekt.'; $lang['pwdforget'] = 'Har du glemt dit adgangskode? Få et nyt'; $lang['resendna'] = 'Denne wiki understøtter ikke udsendelse af nyt adgangskode.'; -$lang['resendpwd'] = 'Send nyt adgangskode for'; $lang['resendpwdmissing'] = 'Du skal udfylde alle felter.'; $lang['resendpwdnouser'] = 'Vi kan ikke finde denne bruger i vores database.'; $lang['resendpwdbadauth'] = 'Beklager, denne autoriseringskode er ikke gyldig. Kontroller venligst at du benyttede det fulde link til bekræftelse.'; diff --git a/inc/lang/el/lang.php b/inc/lang/el/lang.php index 4c334c1de..855c581d0 100644 --- a/inc/lang/el/lang.php +++ b/inc/lang/el/lang.php @@ -43,7 +43,6 @@ $lang['btn_backtomedia'] = 'Επιστροφή στην επιλογή α $lang['btn_subscribe'] = 'Εγγραφή σε λήψη ενημερώσεων σελίδας'; $lang['btn_profile'] = 'Επεξεργασία προφίλ'; $lang['btn_reset'] = 'Ακύρωση'; -$lang['btn_resendpwd'] = 'Αποστολή νέου κωδικού'; $lang['btn_draft'] = 'Επεξεργασία αυτόματα αποθηκευμένης σελίδας'; $lang['btn_recover'] = 'Επαναφορά αυτόματα αποθηκευμένης σελίδας'; $lang['btn_draftdel'] = 'Διαγραφή αυτόματα αποθηκευμένης σελίδας'; @@ -80,7 +79,6 @@ $lang['profnoempty'] = 'Δεν επιτρέπεται κενό όνο $lang['profchanged'] = 'Το προφίλ χρήστη τροποποιήθηκε επιτυχώς.'; $lang['pwdforget'] = 'Ξεχάσατε το κωδικό σας; Αποκτήστε νέο.'; $lang['resendna'] = 'Αυτό το wiki δεν υποστηρίζει την εκ\' νέου αποστολή κωδικών.'; -$lang['resendpwd'] = 'Αποστολή νέων κωδικών για τον χρήστη'; $lang['resendpwdmissing'] = 'Πρέπει να συμπληρώσετε όλα τα πεδία.'; $lang['resendpwdnouser'] = 'Αυτός ο χρήστης δεν υπάρχει στα αρχεία μας.'; $lang['resendpwdbadauth'] = 'Αυτός ο κωδικός ενεργοποίησης δεν είναι έγκυρος.'; diff --git a/inc/lang/eo/lang.php b/inc/lang/eo/lang.php index 8a15981ee..84f96448d 100644 --- a/inc/lang/eo/lang.php +++ b/inc/lang/eo/lang.php @@ -45,7 +45,6 @@ $lang['btn_backtomedia'] = 'Retroiri al elekto de dosiero'; $lang['btn_subscribe'] = 'Aliĝi al paĝaj modifoj'; $lang['btn_profile'] = 'Ĝisdatigi profilon'; $lang['btn_reset'] = 'Rekomenci'; -$lang['btn_resendpwd'] = 'Sendi novan pasvorton'; $lang['btn_draft'] = 'Redakti skizon'; $lang['btn_recover'] = 'Restarigi skizon'; $lang['btn_draftdel'] = 'Forigi skizon'; @@ -82,7 +81,6 @@ $lang['profnoempty'] = 'Malplena nomo aŭ retadreso ne estas permesata $lang['profchanged'] = 'La profilo de la uzanto estas sukcese ĝisdatigita.'; $lang['pwdforget'] = 'Ĉu vi forgesis vian pasvorton? Prenu novan'; $lang['resendna'] = 'Tiu ĉi vikio ne ebligas resendon de la pasvortoj.'; -$lang['resendpwd'] = 'Sendi novan pasvorton al'; $lang['resendpwdmissing'] = 'Pardonu, vi devas plenigi ĉiujn kampojn.'; $lang['resendpwdnouser'] = 'Pardonu, ni ne trovas tiun uzanton en nia datenbazo.'; $lang['resendpwdbadauth'] = 'Pardonu, tiu aŭtentiga kodo ne validas. Certiĝu, ke vi uzis la kompletan konfirmigan ligilon.'; diff --git a/inc/lang/es/lang.php b/inc/lang/es/lang.php index 5164c3243..97e6827c0 100644 --- a/inc/lang/es/lang.php +++ b/inc/lang/es/lang.php @@ -61,7 +61,6 @@ $lang['btn_backtomedia'] = 'Volver a la selección de archivos multimedia' $lang['btn_subscribe'] = 'Suscribirse a cambios de la página'; $lang['btn_profile'] = 'Actualizar perfil'; $lang['btn_reset'] = 'Restablecer'; -$lang['btn_resendpwd'] = 'Enviar nueva contraseña'; $lang['btn_draft'] = 'Editar borrador'; $lang['btn_recover'] = 'Recuperar borrador'; $lang['btn_draftdel'] = 'Eliminar borrador'; @@ -98,7 +97,6 @@ $lang['profnoempty'] = 'No se permite que el nombre o la dirección de $lang['profchanged'] = 'Se actualizó correctamente el perfil del usuario.'; $lang['pwdforget'] = '¿Has olvidado tu contraseña? Consigue una nueva'; $lang['resendna'] = 'Este wiki no brinda la posibilidad de reenvío de contraseña.'; -$lang['resendpwd'] = 'Enviar una nueva contraseña para'; $lang['resendpwdmissing'] = 'Lo siento, debes completar todos los campos.'; $lang['resendpwdnouser'] = 'Lo siento, no se encuentra este usuario en nuestra base de datos.'; $lang['resendpwdbadauth'] = 'Lo siento, este código de autenticación no es válido. Asegúrate de haber usado el enlace de confirmación entero.'; diff --git a/inc/lang/et/lang.php b/inc/lang/et/lang.php index 6cd2f437d..6716e14ba 100644 --- a/inc/lang/et/lang.php +++ b/inc/lang/et/lang.php @@ -43,7 +43,6 @@ $lang['btn_backtomedia'] = 'Tagasi faili valikusse'; $lang['btn_subscribe'] = 'Jälgi seda lehte (teated meilile)'; $lang['btn_profile'] = 'Minu info'; $lang['btn_reset'] = 'Taasta'; -$lang['btn_resendpwd'] = 'Saada uus parool'; $lang['btn_draft'] = 'Toimeta mustandit'; $lang['btn_recover'] = 'Taata mustand'; $lang['btn_draftdel'] = 'Kustuta mustand'; @@ -79,7 +78,6 @@ $lang['profnoempty'] = 'Tühi nimi ega meiliaadress pole lubatud.'; $lang['profchanged'] = 'Kasutaja info edukalt muudetud'; $lang['pwdforget'] = 'Unustasid parooli? Tee uus'; $lang['resendna'] = 'See wiki ei toeta parooli taassaatmist.'; -$lang['resendpwd'] = 'Saada uus parool'; $lang['resendpwdmissing'] = 'Khmm... Sa pead täitma kõik väljad.'; $lang['resendpwdnouser'] = 'Aga sellist kasutajat ei ole.'; $lang['resendpwdbadauth'] = 'See autentimiskood ei ole õige. Kontrolli, et kopeerisid terve lingi.'; diff --git a/inc/lang/eu/lang.php b/inc/lang/eu/lang.php index d02f281c3..4b1ab32ad 100644 --- a/inc/lang/eu/lang.php +++ b/inc/lang/eu/lang.php @@ -40,7 +40,6 @@ $lang['btn_backtomedia'] = 'Atzera Multimedia Fitxategiaren Aukeraketara'; $lang['btn_subscribe'] = 'Harpidetu Orri Aldaketetara'; $lang['btn_profile'] = 'Eguneratu Profila '; $lang['btn_reset'] = 'Aldaketak Desegin'; -$lang['btn_resendpwd'] = 'Pasahitz berria bidali'; $lang['btn_draft'] = 'Editatu zirriborroa'; $lang['btn_recover'] = 'Berreskuratu zirriborroa'; $lang['btn_draftdel'] = 'Ezabatu zirriborroa'; @@ -75,7 +74,6 @@ $lang['profnoempty'] = 'Izen edota e-posta hutsa ez dago onartua.'; $lang['profchanged'] = 'Erabiltzaile profila arrakastaz eguneratua.'; $lang['pwdforget'] = 'Pasahitza ahaztu duzu? Eskuratu berri bat'; $lang['resendna'] = 'Wiki honek ez du pasahitz berbidalketa onartzen.'; -$lang['resendpwd'] = 'Bidali pasahitz berria honentzat:'; $lang['resendpwdmissing'] = 'Barkatu, eremu guztiak bete behar dituzu.'; $lang['resendpwdnouser'] = 'Barkatu, ez dugu erabiltzaile hori datu-basean aurkitzen'; $lang['resendpwdbadauth'] = 'Barkatu, kautotze kodea ez da baliozkoa. Ziurtatu baieztapen esteka osoa erabili duzula.'; diff --git a/inc/lang/fa/lang.php b/inc/lang/fa/lang.php index ac14ce07a..b4643a0ba 100644 --- a/inc/lang/fa/lang.php +++ b/inc/lang/fa/lang.php @@ -47,7 +47,6 @@ $lang['btn_backtomedia'] = 'بازگشت به انتخاب فایل'; $lang['btn_subscribe'] = 'عضویت در تغییرات صفحه'; $lang['btn_profile'] = 'به روز رسانی پروفایل'; $lang['btn_reset'] = 'بازنشاندن'; -$lang['btn_resendpwd'] = 'یک گذرواژه‌ی جدید برای شما فرستاده شود'; $lang['btn_draft'] = 'ویرایش پیش‌نویس'; $lang['btn_recover'] = 'بازیابی پیش‌نویس'; $lang['btn_draftdel'] = 'حذف پیش‌نویس'; @@ -82,7 +81,6 @@ $lang['profnoempty'] = 'نام و آدرس ایمیل باید پر ش $lang['profchanged'] = 'پروفایل کاربر با موفقیت به روز شد'; $lang['pwdforget'] = 'گذرواژه‌ی خود را فراموش کرده‌اید؟ جدید دریافت کنید'; $lang['resendna'] = 'این ویکی ارسال مجدد گذرواژه را پشتیبانی نمی‌کند'; -$lang['resendpwd'] = 'گذرواژه‌ی جدید ارسال شد'; $lang['resendpwdmissing'] = 'متاسفم، شما باید تمام قسمت‌ها را پر کنید'; $lang['resendpwdnouser'] = 'متاسفم، ما نتوانستیم این نام کاربری را در بانک خود پیدا کنیم'; $lang['resendpwdbadauth'] = 'متاسفم، کد شناسایی معتبر نیست. از صحت لینک تاییدیه اطمینان حاصل کنید.'; diff --git a/inc/lang/fi/lang.php b/inc/lang/fi/lang.php index 8d671a4cb..a33095ee4 100644 --- a/inc/lang/fi/lang.php +++ b/inc/lang/fi/lang.php @@ -43,7 +43,6 @@ $lang['btn_backtomedia'] = 'Takaisin mediatiedostojen valintaan'; $lang['btn_subscribe'] = 'Tilaa muutokset'; $lang['btn_profile'] = 'Päivitä profiili'; $lang['btn_reset'] = 'Tyhjennä'; -$lang['btn_resendpwd'] = 'Lähetä uusi salasana'; $lang['btn_draft'] = 'Muokkaa luonnosta'; $lang['btn_recover'] = 'Palauta luonnos'; $lang['btn_draftdel'] = 'Poista luonnos'; @@ -80,7 +79,6 @@ $lang['profnoempty'] = 'Tyhjä nimi tai sähköpostiosoite ei ole sall $lang['profchanged'] = 'Käyttäjän profiilin päivitys onnistui.'; $lang['pwdforget'] = 'Unohtuiko salasana? Hanki uusi'; $lang['resendna'] = 'Tämä wiki ei tue salasanan uudelleenlähettämistä.'; -$lang['resendpwd'] = 'Lähetä uusi salasana käyttäjälle'; $lang['resendpwdmissing'] = 'Kaikki kentät on täytettävä.'; $lang['resendpwdnouser'] = 'Käyttäjää ei löydy tietokannastamme.'; $lang['resendpwdbadauth'] = 'Tunnistuskoodi on virheellinen. Varmista, että käytit koko varmistuslinkkiä.'; diff --git a/inc/lang/fo/lang.php b/inc/lang/fo/lang.php index 4cb895f72..14ec8c56b 100644 --- a/inc/lang/fo/lang.php +++ b/inc/lang/fo/lang.php @@ -40,7 +40,6 @@ $lang['btn_backtomedia'] = 'Aftur til val av miðlafílu'; $lang['btn_subscribe'] = 'Tilmelda broytingar'; $lang['btn_profile'] = 'Dagføra vangamynd'; $lang['btn_reset'] = 'Nullstilla'; -$lang['btn_resendpwd'] = 'Send nýtt loyniorð'; $lang['btn_draft'] = 'Broyt kladdu'; $lang['btn_recover'] = 'Endurbygg kladdu'; $lang['btn_draftdel'] = 'Sletta'; @@ -75,7 +74,6 @@ $lang['profnoempty'] = 'Tómt navn ella t-post adressa er ikki loyvt.' $lang['profchanged'] = 'Brúkara vangamynd dagført rætt.'; $lang['pwdforget'] = 'Gloymt títt loyniorð? Fá eitt nýtt'; $lang['resendna'] = 'Tað er ikki møguligt at fá sent nýtt loyniorð við hesu wiki.'; -$lang['resendpwd'] = 'Send nýtt loyniorð til'; $lang['resendpwdmissing'] = 'Tú skal filla út øll økir.'; $lang['resendpwdnouser'] = 'Vit kunna ikki finna hendan brúkara í okkara dátagrunni.'; $lang['resendpwdbadauth'] = 'Hald til góðar, hendan góðkenningar kodan er ikki gildug. Kanna eftir at tú nýtti tað fulfíggjaðu góðkenningarleinkjuna'; diff --git a/inc/lang/fr/lang.php b/inc/lang/fr/lang.php index a0bc6aff7..6c7123e13 100644 --- a/inc/lang/fr/lang.php +++ b/inc/lang/fr/lang.php @@ -57,7 +57,6 @@ $lang['btn_backtomedia'] = 'Retour à la sélection du fichier média'; $lang['btn_subscribe'] = 'S\'abonner à la page'; $lang['btn_profile'] = 'Mettre à jour le profil'; $lang['btn_reset'] = 'Réinitialiser'; -$lang['btn_resendpwd'] = 'Envoyer le mot de passe'; $lang['btn_draft'] = 'Modifier le brouillon'; $lang['btn_recover'] = 'Récupérer le brouillon'; $lang['btn_draftdel'] = 'Effacer le brouillon'; @@ -94,7 +93,6 @@ $lang['profnoempty'] = 'Un nom ou une adresse de courriel vide n\'est $lang['profchanged'] = 'Mise à jour du profil réussie.'; $lang['pwdforget'] = 'Mot de passe oublié ? Faites-vous envoyer votre mot de passe '; $lang['resendna'] = 'Ce wiki ne permet pas le renvoi de mot de passe.'; -$lang['resendpwd'] = 'Renvoyer le mot de passe de'; $lang['resendpwdmissing'] = 'Désolé, vous devez remplir tous les champs.'; $lang['resendpwdnouser'] = 'Désolé, cet utilisateur est introuvable dans notre base.'; $lang['resendpwdbadauth'] = 'Désolé, ce code d\'authentification est invalide. Assurez-vous d\'avoir utilisé le lien de confirmation.'; diff --git a/inc/lang/gl/lang.php b/inc/lang/gl/lang.php index 01938b3a0..d09cb097f 100644 --- a/inc/lang/gl/lang.php +++ b/inc/lang/gl/lang.php @@ -39,7 +39,6 @@ $lang['btn_backtomedia'] = 'Volver á Selección de Arquivos-Media'; $lang['btn_subscribe'] = 'Avísame dos trocos na páxina'; $lang['btn_profile'] = 'Actualizar Perfil'; $lang['btn_reset'] = 'Reiniciar'; -$lang['btn_resendpwd'] = 'Envíame un novo contrasinal'; $lang['btn_draft'] = 'Editar borrador'; $lang['btn_recover'] = 'Recuperar borrador'; $lang['btn_draftdel'] = 'Eliminar borrador'; @@ -74,7 +73,6 @@ $lang['profnoempty'] = 'Non se permite un nome ou un enderezo de corre $lang['profchanged'] = 'Perfil de usuario actualizado correctamente.'; $lang['pwdforget'] = 'Esqueceches o teu contrasinal? Consegue un novo'; $lang['resendna'] = 'Este wiki non permite o reenvío de contrasinais.'; -$lang['resendpwd'] = 'Enviar novo contrasinal para'; $lang['resendpwdmissing'] = 'Sentímolo, tes que cubrir todos os campos.'; $lang['resendpwdnouser'] = 'Sentímolo, non atopamos este usuario no noso banco de datos.'; $lang['resendpwdbadauth'] = 'Sentímolo, mais este código de autorización non é válido. Asegúrate de que usaches a ligazón completa de confirmación.'; diff --git a/inc/lang/he/lang.php b/inc/lang/he/lang.php index f295e44a9..6ff429695 100644 --- a/inc/lang/he/lang.php +++ b/inc/lang/he/lang.php @@ -45,7 +45,6 @@ $lang['btn_backtomedia'] = 'חזרה לבחירת קובץ מדיה'; $lang['btn_subscribe'] = 'מעקב אחרי שינוים'; $lang['btn_profile'] = 'עדכון הפרופיל'; $lang['btn_reset'] = 'איפוס'; -$lang['btn_resendpwd'] = 'שליחת ססמה חדשה'; $lang['btn_draft'] = 'עריכת טיוטה'; $lang['btn_recover'] = 'שחזור טיוטה'; $lang['btn_draftdel'] = 'מחיקת טיוטה'; @@ -80,7 +79,6 @@ $lang['profnoempty'] = 'השם וכתובת הדוא״ל לא יכול $lang['profchanged'] = 'הפרופיל עודכן בהצלחה'; $lang['pwdforget'] = 'שכחת את הססמה שלך? ניתן לקבל חדשה'; $lang['resendna'] = 'הוויקי הזה אינו תומך בחידוש ססמה'; -$lang['resendpwd'] = 'שליחת ססמה חדשה עבור'; $lang['resendpwdmissing'] = 'עליך למלא את כל השדות, עמך הסליחה.'; $lang['resendpwdnouser'] = 'משתמש בשם זה לא נמצא במסד הנתונים, עמך הסליחה.'; $lang['resendpwdbadauth'] = 'קוד אימות זה אינו תקף. יש לוודא כי נעשה שימוש בקישור האימות המלא, עמך הסליחה.'; diff --git a/inc/lang/hi/lang.php b/inc/lang/hi/lang.php index 00e5589d8..a11220087 100644 --- a/inc/lang/hi/lang.php +++ b/inc/lang/hi/lang.php @@ -59,7 +59,6 @@ $lang['regpwmail'] = 'आपकी डोकुविकी का $lang['reghere'] = 'आपके पास अभी तक कोई खाता नहीं है? बस एक लें |'; $lang['profna'] = 'यह विकी प्रोफ़ाइल संशोधन का समर्थन नहीं करता |'; $lang['profnochange'] = 'कोई परिवर्तन नहीं, कुछ नहीं करना |'; -$lang['resendpwd'] = 'नवगुप्तशब्द भेजें'; $lang['resendpwdmissing'] = 'छमा करें, आपको सारे रिक्त स्थान भरने पड़ेंगे |'; $lang['resendpwdsuccess'] = 'आपका नवगुप्तशब्द ईमेल द्वारा सम्प्रेषित कर दिया गया है |'; $lang['txt_upload'] = 'अपलोड करने के लिए फ़ाइल चुनें'; diff --git a/inc/lang/hr/lang.php b/inc/lang/hr/lang.php index ef10d7720..79a181f1d 100644 --- a/inc/lang/hr/lang.php +++ b/inc/lang/hr/lang.php @@ -42,7 +42,6 @@ $lang['btn_backtomedia'] = 'Povratak na Mediafile izbornik'; $lang['btn_subscribe'] = 'Pretplati se na promjene dokumenta'; $lang['btn_profile'] = 'Ažuriraj profil'; $lang['btn_reset'] = 'Poništi promjene'; -$lang['btn_resendpwd'] = 'Pošalji novu lozinku'; $lang['btn_draft'] = 'Uredi nacrt dokumenta'; $lang['btn_recover'] = 'Vrati prijašnji nacrt dokumenta'; $lang['btn_draftdel'] = 'Obriši nacrt dokumenta'; @@ -77,7 +76,6 @@ $lang['profnoempty'] = 'Prazno korisničko ime ili email nisu dopušte $lang['profchanged'] = 'Korisnički profil je uspješno izmijenjen.'; $lang['pwdforget'] = 'Izgubili ste lozinku? Zatražite novu'; $lang['resendna'] = 'Ovaj wiki ne podržava ponovno slanje lozinke emailom.'; -$lang['resendpwd'] = 'Poslati novu lozinku za'; $lang['resendpwdmissing'] = 'Ispunite sva polja.'; $lang['resendpwdnouser'] = 'Nije moguće pronaći korisnika.'; $lang['resendpwdbadauth'] = 'Neispravan autorizacijski kod. Provjerite da li ste koristili potpun potvrdni link.'; diff --git a/inc/lang/hu/lang.php b/inc/lang/hu/lang.php index 23419a2bd..fd148aa65 100644 --- a/inc/lang/hu/lang.php +++ b/inc/lang/hu/lang.php @@ -45,7 +45,6 @@ $lang['btn_backtomedia'] = 'Vissza a médiafájlok kezeléséhez'; $lang['btn_subscribe'] = 'Oldalváltozások-hírlevél feliratkozás'; $lang['btn_profile'] = 'Személyes beállítások'; $lang['btn_reset'] = 'Alaphelyzet'; -$lang['btn_resendpwd'] = 'Új jelszó küldése'; $lang['btn_draft'] = 'Piszkozat szerkesztése'; $lang['btn_recover'] = 'Piszkozat folytatása'; $lang['btn_draftdel'] = 'Piszkozat törlése'; @@ -80,7 +79,6 @@ $lang['profnoempty'] = 'A név és e-mail mező nem maradhat üresen!' $lang['profchanged'] = 'A személyes beállítások változtatása megtörtént.'; $lang['pwdforget'] = 'Elfelejtetted a jelszavad? Itt kérhetsz újat'; $lang['resendna'] = 'Ez a wiki nem támogatja a jelszó újraküldést.'; -$lang['resendpwd'] = 'Új jelszó kiküldése ennek a felhasználónak'; $lang['resendpwdmissing'] = 'Sajnáljuk, az összes mezőt ki kell töltened.'; $lang['resendpwdnouser'] = 'Sajnáljuk, ilyen azonosítójú felhasználónk nem létezik.'; $lang['resendpwdbadauth'] = 'Sajnáljuk, ez a megerősítő kód nem helyes. Biztos, hogy a teljes megerősítés linket beírtad pontosan?'; diff --git a/inc/lang/ia/lang.php b/inc/lang/ia/lang.php index 8398f29f0..52fec80f0 100644 --- a/inc/lang/ia/lang.php +++ b/inc/lang/ia/lang.php @@ -45,7 +45,6 @@ $lang['btn_backtomedia'] = 'Retornar al selection de files multimedia'; $lang['btn_subscribe'] = 'Gerer subscriptiones'; $lang['btn_profile'] = 'Actualisar profilo'; $lang['btn_reset'] = 'Reinitialisar'; -$lang['btn_resendpwd'] = 'Inviar nove contrasigno'; $lang['btn_draft'] = 'Modificar version provisori'; $lang['btn_recover'] = 'Recuperar version provisori'; $lang['btn_draftdel'] = 'Deler version provisori'; @@ -80,7 +79,6 @@ $lang['profnoempty'] = 'Un nomine o adresse de e-mail vacue non es per $lang['profchanged'] = 'Actualisation del profilo de usator succedite.'; $lang['pwdforget'] = 'Contrasigno oblidate? Obtene un altere'; $lang['resendna'] = 'Iste wiki non supporta le invio de un nove contrasigno.'; -$lang['resendpwd'] = 'Inviar nove contrasigno pro'; $lang['resendpwdmissing'] = 'Es necessari completar tote le campos.'; $lang['resendpwdnouser'] = 'Iste usator non ha essite trovate in le base de datos.'; $lang['resendpwdbadauth'] = 'Iste codice de authentication non es valide. Assecura te que tu ha usate le ligamine de confirmation complete.'; diff --git a/inc/lang/id-ni/lang.php b/inc/lang/id-ni/lang.php index 9c04f0259..1a4d03498 100644 --- a/inc/lang/id-ni/lang.php +++ b/inc/lang/id-ni/lang.php @@ -38,7 +38,6 @@ $lang['btn_backlink'] = 'Link fangawuli'; $lang['btn_backtomedia'] = 'Angawuli ba filianö Mediafile'; $lang['btn_profile'] = 'Famohouni pörofile'; $lang['btn_reset'] = 'Fawu\'a'; -$lang['btn_resendpwd'] = 'Fa\'ohe\'ö kode sibohou'; $lang['btn_draft'] = 'Fawu\'a wanura'; $lang['btn_draftdel'] = 'Heta zura'; $lang['btn_register'] = 'Fasura\'ö'; @@ -69,7 +68,6 @@ $lang['profnoempty'] = 'Lö tetehegö na lö hadöi töi ma imele.'; $lang['profchanged'] = 'Pörofile zangoguna\'ö no tebohouni.'; $lang['pwdforget'] = 'Hadia olifu\'ö kode? Fuli halö kode'; $lang['resendna'] = 'Lö tetehegi ba wiki da\'a wama\'ohe\'ö kode dua kali.'; -$lang['resendpwd'] = 'Tefa\'ohe\'ö kode sibahou khö'; $lang['resendpwdmissing'] = 'Bologö dödöu, si lö tola lö\'ö öfo\'ösi fefu nahia si tohöna.'; $lang['resendpwdnouser'] = 'Bologö dödöu, lö masöndra zangoguna da\'a ba database.'; $lang['resendpwdconfirm'] = 'No tefaohe\'ö link famaduhu\'ö ba imele.'; diff --git a/inc/lang/id/lang.php b/inc/lang/id/lang.php index e8026acee..b1f0e4f26 100644 --- a/inc/lang/id/lang.php +++ b/inc/lang/id/lang.php @@ -42,7 +42,6 @@ $lang['btn_subscribe'] = 'Ikuti Perubahan'; $lang['btn_unsubscribe'] = 'Berhenti Ikuti Perubahan'; $lang['btn_profile'] = 'Ubah Profil'; $lang['btn_reset'] = 'Reset'; -$lang['btn_resendpwd'] = 'Kirim password baru'; $lang['btn_draft'] = 'Edit draft'; $lang['btn_draftdel'] = 'Hapus draft'; $lang['btn_register'] = 'Daftar'; @@ -74,7 +73,6 @@ $lang['profnoempty'] = 'Mohon mengisikan nama atau alamat email.'; $lang['profchanged'] = 'Profil User berhasil diubah.'; $lang['pwdforget'] = 'Lupa Password? Dapatkan yang baru'; $lang['resendna'] = 'Wiki ini tidak mendukung pengiriman ulang password.'; -$lang['resendpwd'] = 'Kirim password baru untuk'; $lang['resendpwdmissing'] = 'Maaf, Anda harus mengisikan semua field.'; $lang['resendpwdnouser'] = 'Maaf, user ini tidak ditemukan.'; $lang['resendpwdbadauth'] = 'Maaf, kode autentikasi tidak valid. Pastikan Anda menggunakan keseluruhan link konfirmasi.'; diff --git a/inc/lang/is/lang.php b/inc/lang/is/lang.php index 0e281e58d..be8ed059f 100644 --- a/inc/lang/is/lang.php +++ b/inc/lang/is/lang.php @@ -47,7 +47,6 @@ $lang['btn_subscribe'] = 'Vakta'; $lang['btn_unsubscribe'] = 'Afvakta'; $lang['btn_profile'] = 'Uppfæra notanda'; $lang['btn_reset'] = 'Endurstilla'; -$lang['btn_resendpwd'] = 'Senda nýtt aðgangsorð með tölvupósti'; $lang['btn_draft'] = 'Breyta uppkasti'; $lang['btn_recover'] = 'Endurheimta uppkast'; $lang['btn_draftdel'] = 'Eyða uppkasti'; @@ -82,7 +81,6 @@ $lang['profnoempty'] = 'Það er ekki leyfilegt að skilja nafn og pó $lang['profchanged'] = 'Notendaupplýsingum breytt'; $lang['pwdforget'] = 'Gleymt aðgangsorð? Fáðu nýtt'; $lang['resendna'] = 'Þessi wiki styður ekki endursendingar aðgangsorðs'; -$lang['resendpwd'] = 'Senda nýtt aðgangsorð fyrir'; $lang['resendpwdmissing'] = 'Afsakið, þú verður að út eyðublaðið allt'; $lang['resendpwdnouser'] = 'Afsakið, notandi finnst ekki.'; $lang['resendpwdbadauth'] = 'Afsakið, þessi sannvottunorð er ekki gild. Gakktu úr skugga um að þú notaðir að ljúka staðfesting hlekkur.'; diff --git a/inc/lang/it/lang.php b/inc/lang/it/lang.php index 9f4d42004..f5538b166 100644 --- a/inc/lang/it/lang.php +++ b/inc/lang/it/lang.php @@ -48,7 +48,6 @@ $lang['btn_backtomedia'] = 'Torna alla selezione file'; $lang['btn_subscribe'] = 'Sottoscrivi modifiche'; $lang['btn_profile'] = 'Aggiorna profilo'; $lang['btn_reset'] = 'Annulla'; -$lang['btn_resendpwd'] = 'Invia nuova password'; $lang['btn_draft'] = 'Modifica bozza'; $lang['btn_recover'] = 'Ripristina bozza'; $lang['btn_draftdel'] = 'Elimina bozza'; @@ -83,7 +82,6 @@ $lang['profnoempty'] = 'Nome o indirizzo email vuoti non sono consenti $lang['profchanged'] = 'Aggiornamento del profilo utente riuscito.'; $lang['pwdforget'] = 'Hai dimenticato la password? Richiedine una nuova'; $lang['resendna'] = 'Questo wiki non supporta l\'invio di nuove password.'; -$lang['resendpwd'] = 'Invia nuova password per'; $lang['resendpwdmissing'] = 'Devi riempire tutti i campi.'; $lang['resendpwdnouser'] = 'Impossibile trovare questo utente nel database.'; $lang['resendpwdbadauth'] = 'Spiacenti, questo codice di autorizzazione non è valido. Assicurati di aver usato il link completo di conferma.'; diff --git a/inc/lang/ja/lang.php b/inc/lang/ja/lang.php index 1eeb6bb73..5a43e7414 100644 --- a/inc/lang/ja/lang.php +++ b/inc/lang/ja/lang.php @@ -42,7 +42,6 @@ $lang['btn_backtomedia'] = 'メディアファイル選択に戻る'; $lang['btn_subscribe'] = '変更履歴配信の登録'; $lang['btn_profile'] = 'ユーザー情報の更新'; $lang['btn_reset'] = 'リセット'; -$lang['btn_resendpwd'] = 'パスワード再発行'; $lang['btn_draft'] = 'ドラフトを編集'; $lang['btn_recover'] = 'ドラフトを復元'; $lang['btn_draftdel'] = 'ドラフトを削除'; @@ -77,7 +76,6 @@ $lang['profnoempty'] = 'ユーザー名とメールアドレスを入 $lang['profchanged'] = 'ユーザー情報は更新されました。'; $lang['pwdforget'] = 'パスワードをお忘れですか？パスワード再発行'; $lang['resendna'] = 'パスワードの再発行は出来ません。'; -$lang['resendpwd'] = '新しいパスワードを送信します：'; $lang['resendpwdmissing'] = '全ての項目を入力して下さい。'; $lang['resendpwdnouser'] = '入力されたユーザーが見つかりませんでした。'; $lang['resendpwdbadauth'] = '申し訳ありません。この確認コードは有効ではありません。メール内に記載されたリンクを確認してください。'; diff --git a/inc/lang/kk/lang.php b/inc/lang/kk/lang.php index f9ea0bced..685759f82 100644 --- a/inc/lang/kk/lang.php +++ b/inc/lang/kk/lang.php @@ -38,7 +38,6 @@ $lang['btn_backtomedia'] = 'Медиафайлды таңдауға қай $lang['btn_subscribe'] = 'Жазылуларды басқару'; $lang['btn_profile'] = 'Профильді жаңарту'; $lang['btn_reset'] = 'Түсіру'; -$lang['btn_resendpwd'] = 'Жаңа құпиясөзді жіберу'; $lang['btn_draft'] = 'Шимайды өңдеу'; $lang['btn_recover'] = 'Шимайды қайтару'; $lang['btn_draftdel'] = 'Шимайды өшіру'; @@ -73,7 +72,6 @@ $lang['profnoempty'] = 'Бос есім не email рұқсат еті $lang['profchanged'] = 'Пайдаланушы профилі сәтті жаңартылған.'; $lang['pwdforget'] = 'Құпиясөзіңізді ұмыттыңызба? Жаңадан біреуін алыңыз'; $lang['resendna'] = 'Бұл wiki құпиясөзді қайта жіберуді қолдамайды.'; -$lang['resendpwd'] = 'Келесіге жаңа құпиясөзді жіберу '; $lang['resendpwdmissing'] = 'Кешіріңіз, барлық тармақтары толтыруыңыз керек.'; $lang['resendpwdnouser'] = 'Кешіріңіз, бұл пайдаланушыны дерекқорымызда тапқан жоқпыз.'; $lang['resendpwdbadauth'] = 'Кешіріңіз, бұл түпнұсқалық коды бұрыс. Толық растау сілтемені пайдалануыңызды тексеріңіз.'; diff --git a/inc/lang/km/lang.php b/inc/lang/km/lang.php index 68587e90f..6a5fa223f 100644 --- a/inc/lang/km/lang.php +++ b/inc/lang/km/lang.php @@ -39,7 +39,6 @@ $lang['btn_subscribe'] = 'ដាក់ដំណឹងផ្លស់ប្ត $lang['btn_unsubscribe'] = 'ដកដំណឹងផ្លស់ប្តូរ'; $lang['btn_profile'] = 'កែប្រវត្តិរូប'; $lang['btn_reset'] = 'កមណត់ឡើងរិញ'; -$lang['btn_resendpwd'] = 'ផ្ញើពាក្សសម្ងាត់'; $lang['btn_draft'] = 'កែគំរោង'; $lang['btn_recover'] = 'ស្រោះគំរោងឡើង'; $lang['btn_draftdel'] = 'លុបគំរោង'; @@ -76,7 +75,6 @@ $lang['profchanged'] = 'ប្រវត្តិរូបអ្នកប្រ $lang['pwdforget'] = 'ភ្លិចពាក្សសម្ងាត់ យកមួយទាត។'; $lang['resendna'] = 'វីគីនេះមិនឧបរំផ្ញើពាក្សសម្ងាតម្ដងទៀតទេ។'; -$lang['resendpwd'] = 'ផ្ញើពាក្សសម្ងាតឲ្យ'; $lang['resendpwdmissing'] = 'សុំអាទោស​ អ្នកត្រវបំពេញវាល។'; $lang['resendpwdnouser'] = 'សុំអាទោស​ យាងរកអ្នកប្រើមិនឃើងទេ។'; $lang['resendpwdbadauth'] = 'សុំអាទោស​ រហស្សលេខអនុញ្ញាតពំអាចប្រើបានទេ។ ខ្សែបន្ត'; diff --git a/inc/lang/ko/lang.php b/inc/lang/ko/lang.php index 91825c797..a9a0bee9f 100644 --- a/inc/lang/ko/lang.php +++ b/inc/lang/ko/lang.php @@ -43,7 +43,6 @@ $lang['btn_backtomedia'] = '미디어 파일 선택으로 돌아가기'; $lang['btn_subscribe'] = '구독 신청'; $lang['btn_profile'] = '개인정보 변경'; $lang['btn_reset'] = '초기화'; -$lang['btn_resendpwd'] = '새 패스워드 보내기'; $lang['btn_draft'] = '문서초안 편집'; $lang['btn_recover'] = '문서초안 복구'; $lang['btn_draftdel'] = '문서초안 삭제'; @@ -78,7 +77,6 @@ $lang['profnoempty'] = '이름이나 이메일 주소가 비었습니 $lang['profchanged'] = '개인정보 변경이 성공했습니다.'; $lang['pwdforget'] = '패스워드를 잊어버린 경우 새로 발급받을 수 있습니다.'; $lang['resendna'] = '이 위키는 패스워드 재발급을 지원하지 않습니다.'; -$lang['resendpwd'] = '새로운 패스워드를 보냅니다.'; $lang['resendpwdmissing'] = '새로운 패스워드를 입력해야햡니다.'; $lang['resendpwdnouser'] = '등록된 사용자가 아닙니다. 다시 확인 바랍니다.'; $lang['resendpwdbadauth'] = '인증 코드가 틀립니다. 잘못된 링크인지 확인 바랍니다.'; diff --git a/inc/lang/la/lang.php b/inc/lang/la/lang.php index fd34a4ef8..a37548d3b 100644 --- a/inc/lang/la/lang.php +++ b/inc/lang/la/lang.php @@ -44,7 +44,6 @@ $lang['btn_backtomedia'] = 'Ad media redire'; $lang['btn_subscribe'] = 'Custodire'; $lang['btn_profile'] = 'Tabellam nouare'; $lang['btn_reset'] = 'Abrogare'; -$lang['btn_resendpwd'] = 'Tesseram nouam cursu interretiali petere'; $lang['btn_draft'] = 'Propositum recensere'; $lang['btn_recover'] = 'Propositum reficere'; $lang['btn_draftdel'] = 'Propositum delere'; @@ -79,7 +78,6 @@ $lang['profnoempty'] = 'Omnes campi complendi sunt.'; $lang['profchanged'] = 'Tabella Sodalis feliciter nouatur'; $lang['pwdforget'] = 'Tesseram amisistine? Nouam petere'; $lang['resendna'] = 'Tesseram non mutare potest.'; -$lang['resendpwd'] = 'Tesseram mitte'; $lang['resendpwdmissing'] = 'Omnes campi complendi sunt.'; $lang['resendpwdnouser'] = 'In tabellis Sodalium nomen non inuentum est.'; $lang['resendpwdbadauth'] = 'Tesseram non legitima est.'; diff --git a/inc/lang/lb/lang.php b/inc/lang/lb/lang.php index 191a9bab5..8af1de4cc 100644 --- a/inc/lang/lb/lang.php +++ b/inc/lang/lb/lang.php @@ -37,7 +37,6 @@ $lang['btn_backlink'] = 'Linker zeréck'; $lang['btn_backtomedia'] = 'Zeréck bei d\'Auswiel vun de Mediadateien'; $lang['btn_profile'] = 'Profil aktualiséieren'; $lang['btn_reset'] = 'Zerécksetzen'; -$lang['btn_resendpwd'] = 'Nei Passwuert schécken'; $lang['btn_draft'] = 'Entworf änneren'; $lang['btn_recover'] = 'Entworf zeréckhuelen'; $lang['btn_draftdel'] = 'Entworf läschen'; @@ -71,7 +70,6 @@ $lang['profnoempty'] = 'En eidele Numm oder Emailadress ass net erlaab $lang['profchanged'] = 'Benotzerprofil erfollegräicht aktualiséiert.'; $lang['pwdforget'] = 'Passwuert vergiess? Fro der e Neit'; $lang['resendna'] = 'Dëse Wiki ënnerstëtzt net d\'Neiverschécke vu Passwieder.'; -$lang['resendpwd'] = 'Nei Passwuert schécke fir'; $lang['resendpwdmissing'] = 'Du muss all Felder ausfëllen.'; $lang['resendpwdnouser'] = 'Kann dëse Benotzer net an der Datebank fannen.'; $lang['resendpwdbadauth'] = 'Den "Auth"-Code ass ongëlteg. Kuck no obs de dee ganze Konfirmationslink benotzt hues.'; diff --git a/inc/lang/lt/lang.php b/inc/lang/lt/lang.php index d14a0695a..c4495bdb8 100644 --- a/inc/lang/lt/lang.php +++ b/inc/lang/lt/lang.php @@ -43,7 +43,6 @@ $lang['btn_subscribe'] = 'Užsisakyti keitimų prenumeratą'; $lang['btn_unsubscribe'] = 'Atsisakyti keitimų prenumeratos'; $lang['btn_profile'] = 'Atnaujinti profilį'; $lang['btn_reset'] = 'Atstata'; -$lang['btn_resendpwd'] = 'Išsiųsti naują slaptažodį'; $lang['btn_draft'] = 'Redaguoti juodraštį'; $lang['btn_recover'] = 'Atkurti juodraštį'; $lang['btn_draftdel'] = 'Šalinti juodraštį'; @@ -77,7 +76,6 @@ $lang['profnoempty'] = 'Tuščias vardo arba el. pašto adreso laukas $lang['profchanged'] = 'Vartotojo profilis sėkmingai atnaujintas.'; $lang['pwdforget'] = 'Pamiršote slaptažodį? Gaukite naują'; $lang['resendna'] = 'Ši vikisvetainė neleidžia persiųsti slaptažodžių.'; -$lang['resendpwd'] = 'Atsiųsti naują slaptažodį'; $lang['resendpwdmissing'] = 'Jūs turite užpildyti visus laukus.'; $lang['resendpwdnouser'] = 'Tokio vartotojo nėra duomenų bazėje.'; $lang['resendpwdbadauth'] = 'Atsiprašome, bet šis tapatybės nustatymo kodas netinkamas. Įsitikinkite, kad panaudojote pilną patvirtinimo nuorodą.'; diff --git a/inc/lang/lv/lang.php b/inc/lang/lv/lang.php index 205d2e56d..21f3494a0 100644 --- a/inc/lang/lv/lang.php +++ b/inc/lang/lv/lang.php @@ -39,7 +39,6 @@ $lang['btn_backtomedia'] = 'Atpakaļ uz mēdiju failu izvēli'; $lang['btn_subscribe'] = 'Abonēt izmaiņu paziņojumus'; $lang['btn_profile'] = 'Labot savu profilu'; $lang['btn_reset'] = 'Atsaukt izmaiņas'; -$lang['btn_resendpwd'] = 'Nosūtīt jaunu paroli'; $lang['btn_draft'] = 'Labot melnrakstu'; $lang['btn_recover'] = 'Atjaunot melnrakstu'; $lang['btn_draftdel'] = 'Dzēst melnrakstu'; @@ -76,7 +75,6 @@ $lang['profnoempty'] = 'Bez vārda vai e-pasta adreses nevar.'; $lang['profchanged'] = 'Profils veiksmīgi izlabots.'; $lang['pwdforget'] = 'Aizmirsi paroli? Saņem jaunu'; $lang['resendna'] = 'Paroļu izsūtīšanu nepiedāvāju.'; -$lang['resendpwd'] = 'Nosūtīt jaunu paroli lietotājam'; $lang['resendpwdmissing'] = 'Atvaino, jāizpilda visas ailes.'; $lang['resendpwdnouser'] = 'Atvaino, tāda lietotāja nav.'; $lang['resendpwdbadauth'] = 'Atvaino, šis autorizācijas kods nav derīgs. Pārliecinies, ka lietoji pilnu apstiprināšanas adresi.'; diff --git a/inc/lang/mk/lang.php b/inc/lang/mk/lang.php index ca4a746cd..8a137ce71 100644 --- a/inc/lang/mk/lang.php +++ b/inc/lang/mk/lang.php @@ -42,7 +42,6 @@ $lang['btn_backtomedia'] = 'Назад до изборот за медиа $lang['btn_subscribe'] = 'Менаџирај претплати'; $lang['btn_profile'] = 'Ажурирај профил'; $lang['btn_reset'] = 'Ресет'; -$lang['btn_resendpwd'] = 'Испрати нов пасворд'; $lang['btn_draft'] = 'Уреди скица'; $lang['btn_recover'] = 'Поврати скица'; $lang['btn_draftdel'] = 'Избриши скица'; @@ -77,7 +76,6 @@ $lang['profnoempty'] = 'Празно име или адреса за $lang['profchanged'] = 'Корисничкиот профил е успешно ажуриран.'; $lang['pwdforget'] = 'Ја заборавивте лозинката? Добијте нова'; $lang['resendna'] = 'Ова вики не поддржува повторно испраќање на лозинка.'; -$lang['resendpwd'] = 'Испрати нова лозинка за'; $lang['resendpwdmissing'] = 'Жалам, морате да ги пополните сите полиња.'; $lang['resendpwdnouser'] = 'Жалам, таков корисник не постои во нашата база со податоци.'; $lang['resendpwdbadauth'] = 'Жалам, овај код за валидација не е валиден. Проверете повторно дали ја искористивте целосната врска за потврда.'; diff --git a/inc/lang/mr/lang.php b/inc/lang/mr/lang.php index 63fda3e5a..4e5001342 100644 --- a/inc/lang/mr/lang.php +++ b/inc/lang/mr/lang.php @@ -47,7 +47,6 @@ $lang['btn_subscribe'] = 'पृष्ठाच्या बदलां $lang['btn_unsubscribe'] = 'पृष्ठाच्या बदलांची पुरवणी (फीड) बंद करा'; $lang['btn_profile'] = 'प्रोफाइल अद्ययावत करा'; $lang['btn_reset'] = 'रिसेट'; -$lang['btn_resendpwd'] = 'कृपया परवलीचा नवीन शब्द माझ्या इमेल पत्त्यावर पाठविणे.'; $lang['btn_draft'] = 'प्रत संपादन'; $lang['btn_recover'] = 'प्रत परत मिळवा'; $lang['btn_draftdel'] = 'प्रत रद्द'; @@ -82,7 +81,6 @@ $lang['profchanged'] = 'सदस्याची प्रोफाइ $lang['pwdforget'] = 'परवलीचा शब्द विसरला आहे का? नविन मागवा.'; $lang['resendna'] = 'ह्या विकी मधे परवलीचा शब्द परत पाथाव्न्याची सुविधा नाही.'; $lang['resendpwd'] = 'नविन परवली इच्छुक'; -$lang['resendpwdmissing'] = 'कृपया सर्व रकाने भरा.'; $lang['resendpwdnouser'] = 'माफ़ करा, हा सदस्य आमच्या माहितिसंग्रहात सापडला नाही.'; $lang['resendpwdbadauth'] = 'माफ़ करा, हा अधिकार कोड बरोबर नाही. कृपया आपण पूर्ण शिकामोर्तबाची लिंक वापरल्याची खात्री करा.'; $lang['resendpwdconfirm'] = 'शिक्कामोर्तबाची लिंक ईमेल द्वारा पाठवली आहे.'; diff --git a/inc/lang/ne/lang.php b/inc/lang/ne/lang.php index 97e2dde5c..8f593267e 100644 --- a/inc/lang/ne/lang.php +++ b/inc/lang/ne/lang.php @@ -40,7 +40,6 @@ $lang['btn_subscribe'] = 'पृष्ठ परिवर्तन ग $lang['btn_unsubscribe'] = 'पृष्ठ परिवर्तन अग्राह्य गर्नुहोस्'; $lang['btn_profile'] = 'प्रोफाइल अध्यावधिक गर्नुहोस् '; $lang['btn_reset'] = 'पूर्वरुपमा फर्काउनुहोस'; -$lang['btn_resendpwd'] = 'नयाँ प्रवेश शव्द(पासवर्ड) पठाउनुहोस् '; $lang['btn_draft'] = ' ड्राफ्ट सम्पादन गर्नुहोस् '; $lang['btn_recover'] = 'पहिलेको ड्राफ्ट हासिल गर्नुहोस '; $lang['btn_draftdel'] = ' ड्राफ्ट मेटाउनुहोस् '; @@ -75,7 +74,6 @@ $lang['profchanged'] = 'प्रयोगकर्ताको प् $lang['pwdforget'] = 'आफ्नो पासवर्ड भुल्नु भयो ? नयाँ हासिल गर्नुहोस् '; $lang['resendna'] = 'यो विकिबाट प्रवेशशव्द पठाउन समर्थित छैन ।'; $lang['resendpwd'] = 'नयाँ प्रवेशशव्द पठाउनुहोस् '; -$lang['resendpwdmissing'] = 'माफ गर्नुहोस् , तपाईले सबै ठाउ भर्नुपर्छ। '; $lang['resendpwdnouser'] = 'माफ गर्नुहोस्, हाम्रो डेटावेसमा यो प्रयोगकर्ता भेटिएन ।'; $lang['resendpwdbadauth'] = 'माफ गर्नुहोस् , यो अनुमति चिन्ह गलत छ। तपाईले पूरै जानकारी लिङ्क प्रयोग गर्नु पर्नेछ। '; $lang['resendpwdconfirm'] = 'तपाईको इमेलमा कन्फरमेशन लिङ्क पठाइएको छ। '; diff --git a/inc/lang/nl/lang.php b/inc/lang/nl/lang.php index 62d23b0d2..705aaf134 100644 --- a/inc/lang/nl/lang.php +++ b/inc/lang/nl/lang.php @@ -50,7 +50,6 @@ $lang['btn_backtomedia'] = 'Terug naar Bestandsselectie'; $lang['btn_subscribe'] = 'Inschrijven wijzigingen'; $lang['btn_profile'] = 'Profiel aanpassen'; $lang['btn_reset'] = 'Wissen'; -$lang['btn_resendpwd'] = 'Stuur een nieuw wachtwoord'; $lang['btn_draft'] = 'Bewerk concept'; $lang['btn_recover'] = 'Herstel concept'; $lang['btn_draftdel'] = 'Verwijder concept'; @@ -87,7 +86,6 @@ $lang['profnoempty'] = 'Een lege gebruikersnaam of e-mailadres is niet $lang['profchanged'] = 'Gebruikersprofiel succesvol aangepast'; $lang['pwdforget'] = 'Je wachtwoord vergeten? Vraag een nieuw wachtwoord aan'; $lang['resendna'] = 'Deze wiki ondersteunt het verzenden van wachtwoorden niet'; -$lang['resendpwd'] = 'Stuur een nieuw wachtwoord voor'; $lang['resendpwdmissing'] = 'Sorry, je moet alle velden invullen.'; $lang['resendpwdnouser'] = 'Sorry, we kunnen deze gebruikersnaam niet vinden in onze database.'; $lang['resendpwdbadauth'] = 'Sorry, deze authentiecatiecode is niet geldig. Controleer of je de volledige bevestigings-link hebt gebruikt.'; diff --git a/inc/lang/no/lang.php b/inc/lang/no/lang.php index 88d21b536..3bf15fffa 100644 --- a/inc/lang/no/lang.php +++ b/inc/lang/no/lang.php @@ -52,7 +52,6 @@ $lang['btn_backtomedia'] = 'Tilbake til valg av mediafil'; $lang['btn_subscribe'] = 'Abonner på endringer'; $lang['btn_profile'] = 'Oppdater profil'; $lang['btn_reset'] = 'Tilbakestill'; -$lang['btn_resendpwd'] = 'Send nytt passord'; $lang['btn_draft'] = 'Rediger kladd'; $lang['btn_recover'] = 'Gjennvinn kladd'; $lang['btn_draftdel'] = 'Slett kladd'; @@ -89,7 +88,6 @@ $lang['profnoempty'] = 'Tomt navn- eller e-postfelt er ikke tillatt.'; $lang['profchanged'] = 'Brukerprofil ble vellykket oppdatert.'; $lang['pwdforget'] = 'Glemt ditt passord? Få deg et nytt'; $lang['resendna'] = 'Denne wikien støtter ikke nyutsending.'; -$lang['resendpwd'] = 'Send nytt passord for'; $lang['resendpwdmissing'] = 'Beklager, du må fylle inn alle felt.'; $lang['resendpwdnouser'] = 'Beklager, vi kan ikke finne denne brukeren i vår database.'; $lang['resendpwdbadauth'] = 'Beklager, denne autorisasjonskoden er ikke gyldig. Sjekk at du brukte hele bekreftelseslenken.'; diff --git a/inc/lang/pl/lang.php b/inc/lang/pl/lang.php index a6fc3d52e..1aafe3eae 100644 --- a/inc/lang/pl/lang.php +++ b/inc/lang/pl/lang.php @@ -47,7 +47,6 @@ $lang['btn_backtomedia'] = 'Powrót do wyboru pliku'; $lang['btn_subscribe'] = 'Subskrybuj zmiany'; $lang['btn_profile'] = 'Aktualizuj profil'; $lang['btn_reset'] = 'Resetuj'; -$lang['btn_resendpwd'] = 'Prześlij nowe hasło'; $lang['btn_draft'] = 'Edytuj szkic'; $lang['btn_recover'] = 'Przywróć szkic'; $lang['btn_draftdel'] = 'Usuń szkic'; @@ -82,7 +81,6 @@ $lang['profnoempty'] = 'Pusta nazwa lub adres e-mail nie dozwolone.'; $lang['profchanged'] = 'Zaktualizowano profil użytkownika.'; $lang['pwdforget'] = 'Nie pamiętasz hasła? Zdobądź nowe!'; $lang['resendna'] = 'To wiki nie pozwala na powtórne przesyłanie hasła.'; -$lang['resendpwd'] = 'Prześlij nowe hasło dla'; $lang['resendpwdmissing'] = 'Wypełnij wszystkie pola.'; $lang['resendpwdnouser'] = 'Nie można znaleźć tego użytkownika w bazie danych.'; $lang['resendpwdbadauth'] = 'Błędny kod autoryzacji! Upewnij się, że użyłeś(aś) właściwego odnośnika.'; diff --git a/inc/lang/pt-br/lang.php b/inc/lang/pt-br/lang.php index 066b3acaa..3721465be 100644 --- a/inc/lang/pt-br/lang.php +++ b/inc/lang/pt-br/lang.php @@ -54,7 +54,6 @@ $lang['btn_backtomedia'] = 'Voltar à seleção do arquivo de mídia'; $lang['btn_subscribe'] = 'Monitorar alterações'; $lang['btn_profile'] = 'Atualizar o perfil'; $lang['btn_reset'] = 'Limpar'; -$lang['btn_resendpwd'] = 'Envie-me uma nova senha'; $lang['btn_draft'] = 'Editar o rascunho'; $lang['btn_recover'] = 'Recuperar o rascunho'; $lang['btn_draftdel'] = 'Excluir o rascunho'; @@ -89,7 +88,6 @@ $lang['profnoempty'] = 'Não são permitidos nomes ou endereços de e- $lang['profchanged'] = 'O perfil do usuário foi atualizado com sucesso.'; $lang['pwdforget'] = 'Esqueceu sua senha? Solicite outra'; $lang['resendna'] = 'Esse wiki não tem suporte para o reenvio de senhas.'; -$lang['resendpwd'] = 'Enviar a nova senha para'; $lang['resendpwdmissing'] = 'Desculpe, você deve preencher todos os campos.'; $lang['resendpwdnouser'] = 'Desculpe, não foi possível encontrar esse usuário no nosso banco de dados.'; $lang['resendpwdbadauth'] = 'Desculpe, esse código de autorização é inválido. Certifique-se de que você usou o link de confirmação inteiro.'; diff --git a/inc/lang/pt/lang.php b/inc/lang/pt/lang.php index 3c3a8d9da..96a157da5 100644 --- a/inc/lang/pt/lang.php +++ b/inc/lang/pt/lang.php @@ -45,7 +45,6 @@ $lang['btn_backtomedia'] = 'Voltar à Selecção de Media'; $lang['btn_subscribe'] = 'Subscrever Alterações'; $lang['btn_profile'] = 'Actualizar Perfil'; $lang['btn_reset'] = 'Limpar'; -$lang['btn_resendpwd'] = 'Enviar nova senha'; $lang['btn_draft'] = 'Editar rascunho'; $lang['btn_recover'] = 'Recuperar rascunho'; $lang['btn_draftdel'] = 'Apagar rascunho'; @@ -86,7 +85,6 @@ $lang['profchanged'] = 'Perfil do utilizador actualizado com sucesso.' $lang['pwdforget'] = 'Esqueceu a sua senha? Pedir nova senha'; $lang['resendna'] = 'Este wiki não suporta reenvio de senhas.'; -$lang['resendpwd'] = 'Enviar nova senha para'; $lang['resendpwdmissing'] = 'É preciso preencher todos os campos.'; $lang['resendpwdnouser'] = 'Não foi possível encontrar este utilizador.'; $lang['resendpwdbadauth'] = 'O código de autenticação não é válido. Por favor, assegure-se de que o link de confirmação está completo.'; diff --git a/inc/lang/ro/lang.php b/inc/lang/ro/lang.php index 91f8ebb97..b88905385 100644 --- a/inc/lang/ro/lang.php +++ b/inc/lang/ro/lang.php @@ -43,7 +43,6 @@ $lang['btn_backtomedia'] = 'Înapoi la Selecţia Mediafile'; $lang['btn_subscribe'] = 'Subscrie Modificarea Paginii'; $lang['btn_profile'] = 'Actualizează Profil'; $lang['btn_reset'] = 'Resetează'; -$lang['btn_resendpwd'] = 'Trimite parola nouă'; $lang['btn_draft'] = 'Editează schiţă'; $lang['btn_recover'] = 'Recuperează schiţă'; $lang['btn_draftdel'] = 'Şterge schiţă'; @@ -80,7 +79,6 @@ $lang['profnoempty'] = 'Nu sunt admise numele sau adresa de email neco $lang['profchanged'] = 'Profilul de utilizator a fost actualizat succes.'; $lang['pwdforget'] = 'Parola uitată? Luaţi una nouă'; $lang['resendna'] = 'Această wiki nu suportă retrimiterea parolei.'; -$lang['resendpwd'] = 'Trimite parola nouă pentru'; $lang['resendpwdmissing'] = 'Ne pare rău, trebuie completate toate câmpurile.'; $lang['resendpwdnouser'] = 'Ne pare rău, acest utilizator nu poate fi găsit în baza de date.'; $lang['resendpwdbadauth'] = 'Ne pare rău, acest cod de autorizare nu este corect. Verificaţi dacă aţi folosit tot link-ul de confirmare.'; diff --git a/inc/lang/ru/lang.php b/inc/lang/ru/lang.php index eda838451..863e75f8f 100644 --- a/inc/lang/ru/lang.php +++ b/inc/lang/ru/lang.php @@ -55,7 +55,6 @@ $lang['btn_backtomedia'] = 'Вернуться к выбору медиа $lang['btn_subscribe'] = 'Подписаться (все правки)'; $lang['btn_profile'] = 'Профиль'; $lang['btn_reset'] = 'Сброс'; -$lang['btn_resendpwd'] = 'Выслать новый пароль'; $lang['btn_draft'] = 'Править черновик'; $lang['btn_recover'] = 'Восстановить черновик'; $lang['btn_draftdel'] = 'Удалить черновик'; @@ -96,7 +95,6 @@ $lang['profchanged'] = 'Профиль пользователя усп $lang['pwdforget'] = 'Забыли пароль? Получите новый'; $lang['resendna'] = 'Данная вики не поддерживает повторную отправку пароля.'; -$lang['resendpwd'] = 'Выслать пароль для'; $lang['resendpwdmissing'] = 'Вы должны заполнить все поля формы.'; $lang['resendpwdnouser'] = 'Пользователь с таким логином не обнаружен в нашей базе данных.'; $lang['resendpwdbadauth'] = 'Извините, неверный код авторизации. Убедитесь, что вы полностью скопировали ссылку. '; diff --git a/inc/lang/sk/lang.php b/inc/lang/sk/lang.php index c0d45da58..a8ea546d3 100644 --- a/inc/lang/sk/lang.php +++ b/inc/lang/sk/lang.php @@ -42,7 +42,6 @@ $lang['btn_backtomedia'] = 'Späť na výber média'; $lang['btn_subscribe'] = 'Sledovať zmeny'; $lang['btn_profile'] = 'Aktualizovať profil'; $lang['btn_reset'] = 'Zrušiť'; -$lang['btn_resendpwd'] = 'Poslať nové heslo'; $lang['btn_draft'] = 'Upraviť koncept'; $lang['btn_recover'] = 'Obnoviť koncept'; $lang['btn_draftdel'] = 'Zmazať koncept'; @@ -79,7 +78,6 @@ $lang['profnoempty'] = 'Prázdne meno alebo mailová adresa nie sú po $lang['profchanged'] = 'Užívateľský účet úspešne zmenený.'; $lang['pwdforget'] = 'Zabudli ste heslo? Získajte nové!'; $lang['resendna'] = 'Táto wiki nepodporuje opätovné zasielanie hesla.'; -$lang['resendpwd'] = 'Pošli nové heslo pre'; $lang['resendpwdmissing'] = 'Prepáčte, musíte vyplniť všetky polia.'; $lang['resendpwdnouser'] = 'Prepáčte, nemôžeme nájsť zadaného užívateľa v databáze.'; $lang['resendpwdbadauth'] = 'Prepáčte, tento autorizačný kód nie je platný. Uistite sa, či ste použili celý autorizačný odkaz.'; diff --git a/inc/lang/sl/lang.php b/inc/lang/sl/lang.php index 9acf13504..75eac8c96 100644 --- a/inc/lang/sl/lang.php +++ b/inc/lang/sl/lang.php @@ -43,7 +43,6 @@ $lang['btn_backtomedia'] = 'Nazaj na izbiro predstavnih datotek'; $lang['btn_subscribe'] = 'Urejanje naročnin'; $lang['btn_profile'] = 'Posodobi profil'; $lang['btn_reset'] = 'Ponastavi'; -$lang['btn_resendpwd'] = 'Pošlji novo geslo'; $lang['btn_draft'] = 'Uredi osnutek'; $lang['btn_recover'] = 'Obnovi osnutek'; $lang['btn_draftdel'] = 'Izbriši osnutek'; @@ -78,7 +77,6 @@ $lang['profnoempty'] = 'Prazno polje elektronskega naslova ali imena n $lang['profchanged'] = 'Uporabniški profil je uspešno posodobljen.'; $lang['pwdforget'] = 'Ali ste pozabili geslo? Pridobite si novo geslo.'; $lang['resendna'] = 'Wiki ne podpira možnosti ponovnega pošiljanja gesel.'; -$lang['resendpwd'] = 'Pošlji novo geslo za'; $lang['resendpwdmissing'] = 'Izpolniti je treba vsa polja.'; $lang['resendpwdnouser'] = 'Podanega uporabniškega imena v podatkovni zbirki ni mogoče najti.'; $lang['resendpwdbadauth'] = 'Koda za overitev ni prava. Prepričajte se, da ste uporabili celotno povezavo za potrditev.'; diff --git a/inc/lang/sq/lang.php b/inc/lang/sq/lang.php index 87d0f30b5..788e21d36 100644 --- a/inc/lang/sq/lang.php +++ b/inc/lang/sq/lang.php @@ -44,7 +44,6 @@ $lang['btn_backtomedia'] = 'Mbrapa tek Përzgjedhja e Media-ve'; $lang['btn_subscribe'] = 'Menaxho Abonimet'; $lang['btn_profile'] = 'Përditëso Profilin'; $lang['btn_reset'] = 'Rivendos'; -$lang['btn_resendpwd'] = 'Dërgo fjalëkalim të ri'; $lang['btn_draft'] = 'Redakto skicën'; $lang['btn_recover'] = 'Rekupero skicën'; $lang['btn_draftdel'] = 'Fshi skicën'; @@ -79,7 +78,6 @@ $lang['profnoempty'] = 'Një emër bosh ose adresë email-i bosh nuk l $lang['profchanged'] = 'Profili i përdoruesit u përditësua me sukses.'; $lang['pwdforget'] = 'E harruat fjalëkalimin? Merni një të ri'; $lang['resendna'] = 'Ky wiki nuk e lejon ridërgimin e fjalëkalimeve.'; -$lang['resendpwd'] = 'Dërgo një fjalëkalim të ri për'; $lang['resendpwdmissing'] = 'Na vjen keq, duhet t\'i plotësoni të gjitha fushat.'; $lang['resendpwdnouser'] = 'Na vjen keq, nuk mund ta gjejmë këtë përdorues në bazën tonë të të dhënave.'; $lang['resendpwdbadauth'] = 'Na vjen keq, ky kod autorizimi nuk është i vlefshëm. Sigurohuni që përdoret linkun e plotë të konfirmimit.'; diff --git a/inc/lang/sr/lang.php b/inc/lang/sr/lang.php index 22bcf4e33..50f486924 100644 --- a/inc/lang/sr/lang.php +++ b/inc/lang/sr/lang.php @@ -41,7 +41,6 @@ $lang['btn_backtomedia'] = 'Врати се на избор медијск $lang['btn_subscribe'] = 'Пријави се на измене'; $lang['btn_profile'] = 'Ажурирај профил'; $lang['btn_reset'] = 'Поништи'; -$lang['btn_resendpwd'] = 'Пошаљи нову лозинку'; $lang['btn_draft'] = 'Измени нацрт'; $lang['btn_recover'] = 'Опорави нацрт'; $lang['btn_draftdel'] = 'Обриши нацрт'; @@ -76,7 +75,6 @@ $lang['profnoempty'] = 'Није дозвољено оставити $lang['profchanged'] = 'Кориснички профил је ажуриран.'; $lang['pwdforget'] = 'Заборавили сте лозинку? Направите нову'; $lang['resendna'] = 'Овај вики не дозвољава слање лозинки.'; -$lang['resendpwd'] = 'Пошаљи нову лозинку за'; $lang['resendpwdmissing'] = 'Жао ми је, сва поља морају бити попуњена.'; $lang['resendpwdnouser'] = 'Жао ми је, овај корисник не постоји у нашој бази.'; $lang['resendpwdbadauth'] = 'Жао ми је, потврдни код није исправан. Проверите да ли сте користили комплетан потврдни линк.'; diff --git a/inc/lang/sv/lang.php b/inc/lang/sv/lang.php index 943509fed..28cc10f6c 100644 --- a/inc/lang/sv/lang.php +++ b/inc/lang/sv/lang.php @@ -52,7 +52,6 @@ $lang['btn_backtomedia'] = 'Tillbaka till val av Mediafil'; $lang['btn_subscribe'] = 'Prenumerera på ändringar'; $lang['btn_profile'] = 'Uppdatera profil'; $lang['btn_reset'] = 'Återställ'; -$lang['btn_resendpwd'] = 'Skicka nytt lösenord'; $lang['btn_draft'] = 'Redigera utkast'; $lang['btn_recover'] = 'Återskapa utkast'; $lang['btn_draftdel'] = 'Radera utkast'; @@ -87,7 +86,6 @@ $lang['profnoempty'] = 'Namn och e-postadress måste fyllas i.'; $lang['profchanged'] = 'Användarprofilen uppdaterad.'; $lang['pwdforget'] = 'Glömt ditt lösenord? Ordna ett nytt'; $lang['resendna'] = 'Den här wikin stödjer inte utskick av lösenord.'; -$lang['resendpwd'] = 'Skicka nytt lösenord för'; $lang['resendpwdmissing'] = 'Du måste fylla i alla fält.'; $lang['resendpwdnouser'] = 'Den här användaren hittas inte i databasen.'; $lang['resendpwdbadauth'] = 'Den här verifieringskoden är inte giltig. Kontrollera att du använde hela verifieringslänken.'; diff --git a/inc/lang/th/lang.php b/inc/lang/th/lang.php index 0d0613961..337fccf85 100644 --- a/inc/lang/th/lang.php +++ b/inc/lang/th/lang.php @@ -48,7 +48,6 @@ $lang['btn_subscribe'] = 'เฝ้าดู'; $lang['btn_unsubscribe'] = 'เลิกเฝ้าดู'; $lang['btn_profile'] = 'แก้ข้อมูลผู้ใช้'; $lang['btn_reset'] = 'เริ่มใหม่'; -$lang['btn_resendpwd'] = 'ลืมรหัส ส่งให้ใหม่ทางอีเมล'; $lang['btn_draft'] = 'แก้ไขเอกสารฉบับร่าง'; $lang['btn_recover'] = 'กู้คืนเอกสารฉบับร่าง'; $lang['btn_draftdel'] = 'ลบเอกสารฉบับร่าง'; @@ -83,7 +82,6 @@ $lang['profnoempty'] = 'ไม่อนุญาติให้เว $lang['profchanged'] = 'ปรับปรุงข้อมูลส่วนตัวผู้ใช้สำเร็จ'; $lang['pwdforget'] = 'ลืมรหัสผ่านหรือ? เอาอันใหม่สิ'; $lang['resendna'] = 'วิกินี้ไม่รองรับการส่งรหัสผ่านซ้ำ'; -$lang['resendpwd'] = 'ส่งรหัสผ่านใหม่ให้กับ'; $lang['resendpwdmissing'] = 'ขออภัย, คุณต้องกรอกทุกช่อง'; $lang['resendpwdnouser'] = 'ขออภัย, เราไม่พบผู้ใช้คนนี้ในฐานข้อมูลของเรา'; $lang['resendpwdbadauth'] = 'ขออภัย, รหัสนี้ยังใช้ไม่ได้ กรุณาตรวจสอบว่าคุณกดลิ้งค์ยืนยันแล้ว'; diff --git a/inc/lang/tr/lang.php b/inc/lang/tr/lang.php index 94b1c951a..b867a5201 100644 --- a/inc/lang/tr/lang.php +++ b/inc/lang/tr/lang.php @@ -43,7 +43,6 @@ $lang['btn_backtomedia'] = 'Çokluortam dosyası seçimine dön'; $lang['btn_subscribe'] = 'Sayfa Değişikliklerini Bildir'; $lang['btn_profile'] = 'Kullanıcı Bilgilerini Güncelle'; $lang['btn_reset'] = 'Sıfırla'; -$lang['btn_resendpwd'] = 'Yeni parola gönder'; $lang['btn_draft'] = 'Taslağı düzenle'; $lang['btn_recover'] = 'Taslağı geri yükle'; $lang['btn_draftdel'] = 'Taslağı sil'; @@ -78,7 +77,6 @@ $lang['profnoempty'] = 'Boş isim veya e-posta adresine izin verilmiyo $lang['profchanged'] = 'Kullanıcı bilgileri başarıyla değiştirildi.'; $lang['pwdforget'] = 'Parolanızı mı unuttunuz? Yeni bir parola alın'; $lang['resendna'] = 'Bu wiki parolayı tekrar göndermeyi desteklememektedir.'; -$lang['resendpwd'] = 'Yeni parolayı gönder:'; $lang['resendpwdmissing'] = 'Üzgünüz, tüm alanları doldurmalısınız.'; $lang['resendpwdnouser'] = 'Üzgünüz, veritabanımızda bu kullanıcıyı bulamadık.'; $lang['resendpwdbadauth'] = 'Üzgünüz, bu doğrulama kodu doğru değil. Doğrulama linkini tam olarak kullandığınıza emin olun.'; diff --git a/inc/lang/uk/lang.php b/inc/lang/uk/lang.php index 22d61c9bf..bd68ecb81 100644 --- a/inc/lang/uk/lang.php +++ b/inc/lang/uk/lang.php @@ -44,7 +44,6 @@ $lang['btn_backtomedia'] = 'Назад до вибору медіа-фай $lang['btn_subscribe'] = 'Підписатися'; $lang['btn_profile'] = 'Оновити профіль'; $lang['btn_reset'] = 'Очистити'; -$lang['btn_resendpwd'] = 'Надіслати новий пароль'; $lang['btn_draft'] = 'Редагувати чернетку'; $lang['btn_recover'] = 'Відновити чернетку'; $lang['btn_draftdel'] = 'Знищити чернетку'; @@ -79,7 +78,6 @@ $lang['profnoempty'] = 'Ім’я або e-mail не можуть бу $lang['profchanged'] = 'Профіль успішно змінено.'; $lang['pwdforget'] = 'Забули пароль? Отримайте новий'; $lang['resendna'] = 'Ця Вікі не підтримує повторне відправлення пароля.'; -$lang['resendpwd'] = 'Надіслати пароль для'; $lang['resendpwdmissing'] = 'Необхідно заповнити усі поля.'; $lang['resendpwdnouser'] = 'Такий користувач не існує.'; $lang['resendpwdbadauth'] = 'Код автентифікації невірний. Перевірте, чи ви використали повне посилання для підтвердження.'; diff --git a/inc/lang/zh-tw/lang.php b/inc/lang/zh-tw/lang.php index a46869d6c..fd12c00ad 100644 --- a/inc/lang/zh-tw/lang.php +++ b/inc/lang/zh-tw/lang.php @@ -45,7 +45,6 @@ $lang['btn_backtomedia'] = '重新選擇圖檔'; $lang['btn_subscribe'] = '訂閱更動通知'; $lang['btn_profile'] = '更新個人資料'; $lang['btn_reset'] = '資料重設'; -$lang['btn_resendpwd'] = '寄新密碼'; $lang['btn_draft'] = '編輯草稿'; $lang['btn_recover'] = '復原草稿'; $lang['btn_draftdel'] = '捨棄草稿'; @@ -80,7 +79,6 @@ $lang['profnoempty'] = '帳號或 email 地址不可空白！'; $lang['profchanged'] = '個人資料已成功更新囉。'; $lang['pwdforget'] = '忘記密碼了？索取新密碼！'; $lang['resendna'] = '本維基不開放重寄密碼'; -$lang['resendpwd'] = '寄新密碼給'; $lang['resendpwdmissing'] = '抱歉，您必須填寫所有欄位。'; $lang['resendpwdnouser'] = '抱歉，資料庫內找不到這個使用者'; $lang['resendpwdbadauth'] = '抱歉，認證碼無效。請確認您使用了完整的確認連結。'; diff --git a/inc/lang/zh/lang.php b/inc/lang/zh/lang.php index 6e6dff6f4..0d89a1e5d 100644 --- a/inc/lang/zh/lang.php +++ b/inc/lang/zh/lang.php @@ -49,7 +49,6 @@ $lang['btn_backtomedia'] = '返回到媒体文件选择工具'; $lang['btn_subscribe'] = '订阅本页更改'; $lang['btn_profile'] = '更新个人信息'; $lang['btn_reset'] = '重设'; -$lang['btn_resendpwd'] = '发送新密码'; $lang['btn_draft'] = '编辑草稿'; $lang['btn_recover'] = '恢复草稿'; $lang['btn_draftdel'] = '删除草稿'; @@ -86,7 +85,6 @@ $lang['profnoempty'] = '不允许使用空的用户名或邮件地址 $lang['profchanged'] = '用户信息更新成功。'; $lang['pwdforget'] = '忘记密码？立即获取新密码'; $lang['resendna'] = '本维基不支持二次发送密码。'; -$lang['resendpwd'] = '发送新密码给'; $lang['resendpwdmissing'] = '对不起，您必须填写所有的区域。'; $lang['resendpwdnouser'] = '对不起，在我们的用户数据中找不到该用户。'; $lang['resendpwdbadauth'] = '对不起，该认证码错误。请使用完整的确认链接。'; -- cgit v1.2.3 From 451e1b4dc1985d10b3aeaeeaf23d5498ce87032b Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Fri, 17 Feb 2012 14:10:10 +0100 Subject: use correct lang string for password mismatch --- inc/auth.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/inc/auth.php b/inc/auth.php index 740a75a5c..437a82a82 100644 --- a/inc/auth.php +++ b/inc/auth.php @@ -872,7 +872,7 @@ function act_resendpwd(){ // password given correctly? if(!isset($_REQUEST['pass']) || $_REQUEST['pass'] == '') return false; if($_REQUEST['pass'] != $_REQUEST['passchk']){ - msg('password mismatch',-1); #FIXME localize + msg($lang['regbadpass'],-1); return false; } $pass = $_REQUEST['pass']; -- cgit v1.2.3 From 4d3ea096062ffd40303a0499aee5b7f757e00948 Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Fri, 17 Feb 2012 21:48:02 +0100 Subject: removed commented line --- inc/html.php | 1 - 1 file changed, 1 deletion(-) diff --git a/inc/html.php b/inc/html.php index dea9ac6ab..50989f236 100644 --- a/inc/html.php +++ b/inc/html.php @@ -1677,7 +1677,6 @@ function html_resendpwd() { $form->startFieldset($lang['btn_resendpwd']); $form->addHidden('token', $token); $form->addHidden('do', 'resendpwd'); - //$form->addElement(form_makeTag('br')); $form->addElement(form_makePasswordField('pass', $lang['pass'], '', 'block', array('size'=>'50'))); $form->addElement(form_makePasswordField('passchk', $lang['passchk'], '', 'block', array('size'=>'50'))); -- cgit v1.2.3 From 8a9735e34dc99c24355e0aee74a3cd49aa3b1492 Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Sun, 19 Feb 2012 13:38:31 +0100 Subject: added a timelimit for password reset tokens passwords now need to be reset within 3 days of requesting the password change mail --- inc/auth.php | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/inc/auth.php b/inc/auth.php index 437a82a82..4e11288e1 100644 --- a/inc/auth.php +++ b/inc/auth.php @@ -860,6 +860,14 @@ function act_resendpwd(){ unset($_REQUEST['pwauth']); return false; } + // token is only valid for 3 days + if( (time() - filemtime($tfile)) > (3*60*60*24) ){ + msg($lang['resendpwdbadauth'],-1); + unset($_REQUEST['pwauth']); + @unlink($tfile); + return false; + } + $user = io_readfile($tfile); $userinfo = $auth->getUserData($user); if(!$userinfo['mail']) { -- cgit v1.2.3 From 361171a4e89a313fae8aa823c2279b32ec0c08bc Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Wed, 22 Feb 2012 17:34:53 +0100 Subject: simpler/more robust header parsing in HTTPClient The previous regexp approach failed for empty headers. --- inc/HTTPClient.php | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/inc/HTTPClient.php b/inc/HTTPClient.php index 641950348..f0470e736 100644 --- a/inc/HTTPClient.php +++ b/inc/HTTPClient.php @@ -580,13 +580,14 @@ class HTTPClient { */ function _parseHeaders($string){ $headers = array(); - if (!preg_match_all('/^\s*([\w-]+)\s*:\s*([\S \t]+)\s*$/m', $string, - $matches, PREG_SET_ORDER)) { - return $headers; - } - foreach($matches as $match){ - list(, $key, $val) = $match; + $lines = explode("\n",$string); + array_shift($lines); //skip first line (status) + foreach($lines as $line){ + list($key, $val) = explode(':',$line,2); + $key = trim($key); + $val = trim($val); $key = strtolower($key); + if(!$key) continue; if(isset($headers[$key])){ if(is_array($headers[$key])){ $headers[$key][] = $val; -- cgit v1.2.3 From c55a2a4155c1ec0a13bcd2394086b7a65293d082 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Thu, 23 Feb 2012 03:20:09 +0000 Subject: made styles for .pad and .site divs more specific to avoid interfering with the same classes somewhere else within the page --- lib/tpl/dokuwiki/css/design.css | 4 ++-- lib/tpl/dokuwiki/css/mobile.css | 6 +++--- lib/tpl/dokuwiki/css/pagetools.css | 2 +- lib/tpl/dokuwiki/css/rtl.css | 6 +++--- lib/tpl/dokuwiki/css/structure.css | 10 +++++----- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/lib/tpl/dokuwiki/css/design.css b/lib/tpl/dokuwiki/css/design.css index 39d793f99..9e76be6ae 100644 --- a/lib/tpl/dokuwiki/css/design.css +++ b/lib/tpl/dokuwiki/css/design.css @@ -181,7 +181,7 @@ #dokuwiki__aside { } -#dokuwiki__aside .pad { +#dokuwiki__aside > .pad { font-size: 0.875em; overflow: hidden; word-wrap: break-word; @@ -450,7 +450,7 @@ #dokuwiki__footer { margin-bottom: 1em; } -#dokuwiki__footer .pad { +#dokuwiki__footer > .pad { font-size: 0.875em; } #dokuwiki__footer div.license { diff --git a/lib/tpl/dokuwiki/css/mobile.css b/lib/tpl/dokuwiki/css/mobile.css index 38242f5be..1239a90a3 100644 --- a/lib/tpl/dokuwiki/css/mobile.css +++ b/lib/tpl/dokuwiki/css/mobile.css @@ -14,7 +14,7 @@ width: 100%; float: none; } -#dokuwiki__aside .pad { +#dokuwiki__aside > .pad { margin: 0 0 .5em; } @@ -23,7 +23,7 @@ margin-left: 0; width: 100%; } -.hasSidebar #dokuwiki__content .pad { +.hasSidebar #dokuwiki__content > .pad { margin-left: 0; } @@ -77,7 +77,7 @@ #dokuwiki__site { max-width: 100%; } -#dokuwiki__site .site { +#dokuwiki__site > .site { padding: 0 .5em; } #dokuwiki__header { diff --git a/lib/tpl/dokuwiki/css/pagetools.css b/lib/tpl/dokuwiki/css/pagetools.css index a25032f0b..e301b084d 100644 --- a/lib/tpl/dokuwiki/css/pagetools.css +++ b/lib/tpl/dokuwiki/css/pagetools.css @@ -6,7 +6,7 @@ * @author Andreas Gohr */ -#dokuwiki__site .site { +#dokuwiki__site > .site { /* give space to the right so the tools won't disappear on smaller screens */ /* it's 40px because the 30px wide icons will have 5px more spacing to the left and right */ padding-right: 40px; diff --git a/lib/tpl/dokuwiki/css/rtl.css b/lib/tpl/dokuwiki/css/rtl.css index 790545a1b..e3bb7e27b 100644 --- a/lib/tpl/dokuwiki/css/rtl.css +++ b/lib/tpl/dokuwiki/css/rtl.css @@ -249,7 +249,7 @@ form#subscribe__form fieldset { #dokuwiki__aside { float: right; } -#dokuwiki__aside .pad { +#dokuwiki__aside > .pad { margin: 0 0 0 1.5em; } @@ -258,7 +258,7 @@ form#subscribe__form fieldset { margin-left: 0; margin-right: -__sidebar_width__; } -.hasSidebar #dokuwiki__content .pad { +.hasSidebar #dokuwiki__content > .pad { margin-left: 0; margin-right: __sidebar_width__; } @@ -523,7 +523,7 @@ form#subscribe__form fieldset { .hasSidebar #dokuwiki__content, -.hasSidebar #dokuwiki__content .pad { +.hasSidebar #dokuwiki__content > .pad { margin-right: 0; } diff --git a/lib/tpl/dokuwiki/css/structure.css b/lib/tpl/dokuwiki/css/structure.css index 4e3a14be8..9cca1aa3b 100644 --- a/lib/tpl/dokuwiki/css/structure.css +++ b/lib/tpl/dokuwiki/css/structure.css @@ -11,14 +11,14 @@ body { margin: 0 auto; max-width: __site_width__; } -#dokuwiki__site .site { +#dokuwiki__site > .site { padding: 0 .5em; } #dokuwiki__header { width: 100%; } -#dokuwiki__header .pad { +#dokuwiki__header > .pad { } #dokuwiki__header .headings { float: left; @@ -38,7 +38,7 @@ body { position: relative; display: block; } - #dokuwiki__aside .pad { + #dokuwiki__aside > .pad { margin: 0 1.5em 0 0; } @@ -47,12 +47,12 @@ body { margin-left: -__sidebar_width__; width: 100%; } - .hasSidebar #dokuwiki__content .pad { + .hasSidebar #dokuwiki__content > .pad { margin-left: __sidebar_width__; } #dokuwiki__footer { clear: both; } -#dokuwiki__footer .pad { +#dokuwiki__footer > .pad { } -- cgit v1.2.3 From 4c3ecbf1c41f3608f8fec22cf30ada73662bdf12 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Thu, 23 Feb 2012 03:22:32 +0000 Subject: updated RTL styles to latest mobile changes --- lib/tpl/dokuwiki/css/rtl.css | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/lib/tpl/dokuwiki/css/rtl.css b/lib/tpl/dokuwiki/css/rtl.css index e3bb7e27b..851f70850 100644 --- a/lib/tpl/dokuwiki/css/rtl.css +++ b/lib/tpl/dokuwiki/css/rtl.css @@ -519,7 +519,7 @@ form#subscribe__form fieldset { /*____________ mobile ____________*/ -@media only screen and (max-width: 480px), only screen and (max-device-width: 480px) { +@media only screen and (max-width: 768px), only screen and (max-device-width: 960px) { .hasSidebar #dokuwiki__content, @@ -527,6 +527,18 @@ form#subscribe__form fieldset { margin-right: 0; } +.dokuwiki div.toc { + float: none; + margin: 0 0 1em 0; + border-right-width: 0; +} + + +} /* /@media */ + +@media only screen and (max-width: 480px), only screen and (max-device-width: 480px) { + + #dokuwiki__header ul.a11y.skip { left: auto !important; right: 0 !important; @@ -556,12 +568,6 @@ form#subscribe__form fieldset { float: left; } -.dokuwiki div.toc { - float: none; - margin: 0 0 1em 0; - border-right-width: 0; -} - .dokuwiki label.block { text-align: right; } -- cgit v1.2.3 From 0bd81194a560aef3cb7ac06e849889fb9fa888b0 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Thu, 23 Feb 2012 03:23:53 +0000 Subject: fixed swipe diff view --- lib/tpl/dokuwiki/css/_media_fullscreen.css | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/tpl/dokuwiki/css/_media_fullscreen.css b/lib/tpl/dokuwiki/css/_media_fullscreen.css index 3bf48e9ec..9054ab26f 100644 --- a/lib/tpl/dokuwiki/css/_media_fullscreen.css +++ b/lib/tpl/dokuwiki/css/_media_fullscreen.css @@ -453,5 +453,6 @@ #mediamanager__diff .imageDiff img { width: 100%; + max-width: none; } -- cgit v1.2.3 From bb866f2f0a7a6171228b0887a3f92261d78ad556 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Thu, 23 Feb 2012 03:25:08 +0000 Subject: fixed lists beside floating content (FS#1950) --- lib/tpl/dokuwiki/css/basic.css | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/tpl/dokuwiki/css/basic.css b/lib/tpl/dokuwiki/css/basic.css index ae9be499e..e1cd1d9a2 100644 --- a/lib/tpl/dokuwiki/css/basic.css +++ b/lib/tpl/dokuwiki/css/basic.css @@ -104,6 +104,7 @@ div { ul, ol { padding: 0 0 0 1.5em; + overflow: hidden; } li, dd { -- cgit v1.2.3 From 8204206b83c57f7a74ac587d2b81f7b04fdc3ba3 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Thu, 23 Feb 2012 03:26:16 +0000 Subject: deleted another obsolete file --- lib/tpl/dokuwiki/css/_mediamanager.css | 219 --------------------------------- 1 file changed, 219 deletions(-) delete mode 100644 lib/tpl/dokuwiki/css/_mediamanager.css diff --git a/lib/tpl/dokuwiki/css/_mediamanager.css b/lib/tpl/dokuwiki/css/_mediamanager.css deleted file mode 100644 index d47e581ff..000000000 --- a/lib/tpl/dokuwiki/css/_mediamanager.css +++ /dev/null @@ -1,219 +0,0 @@ -/** - * This file provides styles for the media manager - * (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__; -} -#mediamgr__aside .pad { - padding: .5em; -} - -#mediamgr__content { - width: 69.7%; - height: 100%; - overflow: auto; - position: absolute; - right: 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; -} -#media__opts label { -} - -/*____________ tree ____________*/ - -#media__tree ul { - padding-left: .2em; -} -#media__tree ul li { - clear: left; - list-style-type: none; - list-style-image: none; - margin-left: 0; -} -#media__tree ul li img { - float: left; - padding: .5em .3em 0 0; -} -#media__tree ul li div.li { - display: inline; -} -#media__tree ul li li { - margin-left: 1.5em; -} - -/* right side -********************************************************************/ - -/*____________ upload form ____________*/ - -/* upload info */ -#media__content div.upload { - font-size: .9em; - margin-bottom: .5em; -} - -#media__content form#dw__upload, -#media__content div#dw__flashupload { - display: block; - border-bottom: solid 1px __border__; - padding-bottom: 1em; - margin-bottom: 1em; -} -#media__content form#dw__upload p { - margin-bottom: .5em; -} - -#media__content form#dw__upload label { -} -#media__content form#dw__upload label.check { -} -#media__content form#dw__upload input.check { -} -#media__content form#dw__upload input.edit { -} -#media__content form#dw__upload img { -} - -/*____________ 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; -} -#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; -} -#media__content div.detail div.thumb a { - display: block; -} -#media__content div.detail p { - margin-bottom: 0; -} - - -/*____________ media search ____________*/ - -form#dw__mediasearch { -} -form#dw__mediasearch p { -} -form#dw__mediasearch label { -} -form#dw__mediasearch label span { -} -form#dw__mediasearch input.edit { -} -form#dw__mediasearch input.button { -} - - -/* meta edit form -********************************************************************/ - -#media__content form.meta { -} - -#media__content form.meta div.metafield { - clear: left; - margin-bottom: .5em; - overflow: hidden; -} - -#media__content form.meta label { - display: block; - width: 25%; - float: left; - font-weight: bold; - clear: left; -} -#media__content form.meta .edit { - float: left; - width: 70%; - margin: 0; -} -#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%; -} -- cgit v1.2.3 From a502f0b0f21a6aeb8022290c1f7c54f81f7de89d Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Thu, 23 Feb 2012 03:32:04 +0000 Subject: deleted README file from new template --- lib/tpl/dokuwiki/README | 5 ----- 1 file changed, 5 deletions(-) delete mode 100644 lib/tpl/dokuwiki/README diff --git a/lib/tpl/dokuwiki/README b/lib/tpl/dokuwiki/README deleted file mode 100644 index 966fc45f1..000000000 --- a/lib/tpl/dokuwiki/README +++ /dev/null @@ -1,5 +0,0 @@ -Starter Template for DokuWiki -http://www.dokuwiki.org/template:starter - -version: 2011-02-20 -author: Anika Henke -- cgit v1.2.3 From 5e5582cecaa7271e3ab1c69c898f9ce0ac383291 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Thu, 23 Feb 2012 04:11:59 +0000 Subject: changed the way RTL styles are added Add rtl.css as *screen* style, but append all RTL styles with [dir=rtl]. That has the advantage that all styles are in the same CSS output, so there are no different requests. Later on all styles in rtl.css should be moved to their respective "parent" css file. --- lib/tpl/dokuwiki/css/rtl.css | 326 ++++++++++++++++++++++--------------------- lib/tpl/dokuwiki/style.ini | 2 +- 2 files changed, 168 insertions(+), 160 deletions(-) diff --git a/lib/tpl/dokuwiki/css/rtl.css b/lib/tpl/dokuwiki/css/rtl.css index 851f70850..8a6a9f631 100644 --- a/lib/tpl/dokuwiki/css/rtl.css +++ b/lib/tpl/dokuwiki/css/rtl.css @@ -7,28 +7,36 @@ /*____________ basic ____________*/ -caption, -td, -th { +[dir=rtl] caption, +[dir=rtl] td, +[dir=rtl] th { text-align: right; } -ul, ol { +[dir=rtl] ul, +[dir=rtl] ol { padding: 0 1.5em 0 0; } -li, dd { +[dir=rtl] li, +[dir=rtl] dd { margin: 0 1.5em 0 0; } -blockquote { +[dir=rtl] blockquote { border-width: 0 .25em 0 0; } -h1, h2, h3, h4, h5, h6, -caption, legend { +[dir=rtl] h1, +[dir=rtl] h2, +[dir=rtl] h3, +[dir=rtl] h4, +[dir=rtl] h5, +[dir=rtl] h6, +[dir=rtl] caption, +[dir=rtl] legend { clear: right; } -.a11y { +[dir=rtl] .a11y { left: auto; right: -9000px; } @@ -36,70 +44,70 @@ caption, legend { /*____________ _imgdetail ____________*/ -#dokuwiki__detail div.content img { +[dir=rtl] #dokuwiki__detail div.content img { float: right; margin-right: 0; margin-left: 1.5em; } -#dokuwiki__detail div.content div.img_detail { +[dir=rtl] #dokuwiki__detail div.content div.img_detail { float: right } /*____________ _mediamanager ____________*/ -#mediamgr__aside { +[dir=rtl] #mediamgr__aside { left: auto; right: 0; border-right-width: 0; border-left: 1px solid __border__; } -#mediamgr__content { +[dir=rtl] #mediamgr__content { right: auto; left: 0; } -#media__opts input { +[dir=rtl] #media__opts input { margin-right: 0; margin-left: .3em; } -#media__tree ul { +[dir=rtl] #media__tree ul { padding-left: 0; padding-right: .2em; } -#media__tree ul li { +[dir=rtl] #media__tree ul li { clear: right; margin-right: 0; } -#media__tree ul li img { +[dir=rtl] #media__tree ul li img { float: right; padding: .5em 0 0 .3em; } -#media__tree ul li li { +[dir=rtl] #media__tree ul li li { margin-left: 0; margin-right: 1.5em; } -#media__content a.mediafile { +[dir=rtl] #media__content a.mediafile { margin-right: 0; margin-left: 1.5em; } -#media__content div.detail div.thumb { +[dir=rtl] #media__content div.detail div.thumb { float: right; margin: 0 18px 0 .5em; } -#media__content form.meta div.metafield { +[dir=rtl] #media__content form.meta div.metafield { clear: right; } -#media__content form.meta label { +[dir=rtl] #media__content form.meta label { float: right; clear: right; } -#media__content form.meta .edit { +[dir=rtl] #media__content form.meta .edit { float: right; } -#media__content form.meta div.buttons { +[dir=rtl] #media__content form.meta div.buttons { clear: right; margin: .2em 25% 0 0; } @@ -108,11 +116,11 @@ caption, legend { /*____________ _links ____________*/ /* if link icons don't work as expected, remove the following lines */ -.dokuwiki a.urlextern, -.dokuwiki a.windows, -.dokuwiki a.mail, -.dokuwiki a.interwiki, -.dokuwiki a.mediafile { +[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 17px 0 0; } @@ -120,20 +128,20 @@ caption, legend { /*____________ _toc ____________*/ -.dokuwiki div.toc { +[dir=rtl] .dokuwiki div.toc { float: left; margin: 0 1.4em 1.4em 0; } -.dokuwiki .toc span.toc_open, -.dokuwiki .toc span.toc_close { +[dir=rtl] .dokuwiki .toc span.toc_open, +[dir=rtl] .dokuwiki .toc span.toc_close { float: left; } -.dokuwiki #toc__inside ul ul { +[dir=rtl] .dokuwiki #toc__inside ul ul { padding-left: 0; padding-right: 1em; } -.dokuwiki ul.idx { +[dir=rtl] .dokuwiki ul.idx { padding-right: 0; } @@ -143,10 +151,10 @@ caption, legend { /*____________ _search ____________*/ -.dokuwiki div.search_quickresult ul li { +[dir=rtl] .dokuwiki div.search_quickresult ul li { float: right; } -.dokuwiki form.search div.ajax_qsearch { +[dir=rtl] .dokuwiki form.search div.ajax_qsearch { left: auto; right: -13.5em; text-align: right; @@ -155,8 +163,8 @@ caption, legend { /*____________ _recent ____________*/ -.dokuwiki #dw__recent ul li, -.dokuwiki #page__revisions ul li { +[dir=rtl] .dokuwiki #dw__recent ul li, +[dir=rtl] .dokuwiki #page__revisions ul li { margin-right: 0; } @@ -166,36 +174,36 @@ caption, legend { /*____________ _edit ____________*/ -.dokuwiki div.toolbar #draft__status { +[dir=rtl] .dokuwiki div.toolbar #draft__status { float: left; } -.dokuwiki #wiki__editbar #size__ctl { +[dir=rtl] .dokuwiki #wiki__editbar #size__ctl { float: left; } -.dokuwiki #wiki__editbar #size__ctl img { +[dir=rtl] .dokuwiki #wiki__editbar #size__ctl img { cursor: pointer; } -.dokuwiki #wiki__editbar .editButtons { +[dir=rtl] .dokuwiki #wiki__editbar .editButtons { margin-right: 0; margin-left: 1em; } -.dokuwiki .secedit { +[dir=rtl] .dokuwiki .secedit { float: left; } /*____________ _modal ____________*/ -#link__wiz_close { +[dir=rtl] #link__wiz_close { float: left; } -#link__wiz_result { +[dir=rtl] #link__wiz_result { text-align: right; } -#link__wiz_result div.type_u, -#link__wiz_result div.type_f, -#link__wiz_result div.type_d { +[dir=rtl] #link__wiz_result div.type_u, +[dir=rtl] #link__wiz_result div.type_f, +[dir=rtl] #link__wiz_result div.type_d { padding: 3px 22px 3px 3px; background-position: 257px 3px; } @@ -203,30 +211,30 @@ caption, legend { /*____________ _forms ____________*/ -.dokuwiki label.block { +[dir=rtl] .dokuwiki label.block { text-align: left; } -.dokuwiki label.simple { +[dir=rtl] .dokuwiki label.simple { text-align: right; } -form#subscribe__form fieldset { +[dir=rtl] form#subscribe__form fieldset { text-align: right; } /*____________ _admin ____________*/ -.dokuwiki ul.admin_tasks { +[dir=rtl] .dokuwiki ul.admin_tasks { float: right; } -.dokuwiki ul.admin_tasks li { +[dir=rtl] .dokuwiki ul.admin_tasks li { padding-left: 0; padding-right: 35px; background-position: right 0; } -.dokuwiki #admin__version { +[dir=rtl] .dokuwiki #admin__version { clear: right; float: left; } @@ -237,73 +245,73 @@ form#subscribe__form fieldset { /*____________ structure ____________*/ -#dokuwiki__header .headings { +[dir=rtl] #dokuwiki__header .headings { float: right; text-align: right; } -#dokuwiki__header .tools { +[dir=rtl] #dokuwiki__header .tools { float: left; text-align: left; } -#dokuwiki__aside { +[dir=rtl] #dokuwiki__aside { float: right; } -#dokuwiki__aside > .pad { +[dir=rtl] #dokuwiki__aside > .pad { margin: 0 0 0 1.5em; } -.hasSidebar #dokuwiki__content { +[dir=rtl] .hasSidebar #dokuwiki__content { float: left; margin-left: 0; margin-right: -__sidebar_width__; } -.hasSidebar #dokuwiki__content > .pad { +[dir=rtl] .hasSidebar #dokuwiki__content > .pad { margin-left: 0; margin-right: __sidebar_width__; } /*____________ design ____________*/ -#dokuwiki__header h1 img { +[dir=rtl] #dokuwiki__header h1 img { float: right; margin-left: .5em; margin-right: 0; } -#dokuwiki__sitetools form.search input.edit { +[dir=rtl] #dokuwiki__sitetools form.search input.edit { padding: .35em .1em .35em 22px; } -#dokuwiki__sitetools form.search input.button { +[dir=rtl] #dokuwiki__sitetools form.search input.button { background-position: 5px 0; margin-left: 0; margin-right: -20px; } -#dokuwiki__usertools { +[dir=rtl] #dokuwiki__usertools { text-align: left; left: 40px; right: auto; } -#dokuwiki__sitetools { +[dir=rtl] #dokuwiki__sitetools { text-align: left; } -#dokuwiki__aside ul, #dokuwiki__aside ol { +[dir=rtl] #dokuwiki__aside ul, #dokuwiki__aside ol { padding-right: 0; } -.dokuwiki .pageId { +[dir=rtl] .dokuwiki .pageId { right: auto; left: -1em; } -.dokuwiki .docInfo { +[dir=rtl] .dokuwiki .docInfo { text-align: left; } -.dokuwiki div.toolbar button.toolbutton:first-child { +[dir=rtl] .dokuwiki div.toolbar button.toolbutton:first-child { border-top-left-radius: 0; border-bottom-left-radius: 0; border-top-right-radius: 4px; @@ -311,7 +319,7 @@ form#subscribe__form fieldset { border-left-width: 0; border-right-width: 1px; } -.dokuwiki div.toolbar button.toolbutton:last-child { +[dir=rtl] .dokuwiki div.toolbar button.toolbutton:last-child { border-top-left-radius: 4px; border-bottom-left-radius: 4px; border-top-right-radius: 0; @@ -319,30 +327,30 @@ form#subscribe__form fieldset { border-left-width: 1px; } -.dokuwiki div.section_highlight { +[dir=rtl] .dokuwiki div.section_highlight { margin-right: -2em; border-right-width: 1em; } -#dokuwiki__footer .license img { +[dir=rtl] #dokuwiki__footer .license img { margin: 0 0 0 .5em; } -.dokuwiki div.toc { +[dir=rtl] .dokuwiki div.toc { margin: -2em 1.4em .5em -2em; border-left-width: 0; border-right: 1px solid __border__; } -.dokuwiki #toc__inside ul { +[dir=rtl] .dokuwiki #toc__inside ul { padding: 0 1.5em 0 0; } -#dokuwiki__detail div.img_detail dl dt { +[dir=rtl] #dokuwiki__detail div.img_detail dl dt { float: right; text-align: left; clear: right; } -#dokuwiki__detail div.img_detail dl dd { +[dir=rtl] #dokuwiki__detail div.img_detail dl dd { margin-left: 0; margin-right: 9.5em; } @@ -350,142 +358,142 @@ form#subscribe__form fieldset { /*____________ pagetools ____________*/ -#dokuwiki__usertools { +[dir=rtl] #dokuwiki__usertools { right: auto; left: 40px; } -#dokuwiki__pagetools { +[dir=rtl] #dokuwiki__pagetools { right: auto; left: -40px; } -#dokuwiki__pagetools ul { +[dir=rtl] #dokuwiki__pagetools ul { right: auto; left: 0; text-align: left; } -#dokuwiki__pagetools ul li a { +[dir=rtl] #dokuwiki__pagetools ul li a { padding: 5px 5px 5px 40px; background-position: left 0; } -#dokuwiki__pagetools:hover ul, -#dokuwiki__pagetools ul li a:focus { +[dir=rtl] #dokuwiki__pagetools:hover ul, +[dir=rtl] #dokuwiki__pagetools ul li a:focus { box-shadow: -2px 2px 2px __text_alt__; } /* all available icons in sprite */ -#dokuwiki__pagetools ul li a.edit { +[dir=rtl] #dokuwiki__pagetools ul li a.edit { background-position: left 0; } -#dokuwiki__pagetools ul li a.edit:hover, -#dokuwiki__pagetools ul li a.edit:active, -#dokuwiki__pagetools ul li a.edit:focus { +[dir=rtl] #dokuwiki__pagetools ul li a.edit:hover, +[dir=rtl] #dokuwiki__pagetools ul li a.edit:active, +[dir=rtl] #dokuwiki__pagetools ul li a.edit:focus { background-position: left -45px; } -#dokuwiki__pagetools ul li a.create { +[dir=rtl] #dokuwiki__pagetools ul li a.create { background-position: left -90px; } -#dokuwiki__pagetools ul li a.create:hover, -#dokuwiki__pagetools ul li a.create:active, -#dokuwiki__pagetools ul li a.create:focus { +[dir=rtl] #dokuwiki__pagetools ul li a.create:hover, +[dir=rtl] #dokuwiki__pagetools ul li a.create:active, +[dir=rtl] #dokuwiki__pagetools ul li a.create:focus { background-position: left -135px; } -#dokuwiki__pagetools ul li a.show { +[dir=rtl] #dokuwiki__pagetools ul li a.show { background-position: left -270px; } -#dokuwiki__pagetools ul li a.show:hover, -#dokuwiki__pagetools ul li a.show:active, -#dokuwiki__pagetools ul li a.show:focus { +[dir=rtl] #dokuwiki__pagetools ul li a.show:hover, +[dir=rtl] #dokuwiki__pagetools ul li a.show:active, +[dir=rtl] #dokuwiki__pagetools ul li a.show:focus { background-position: left -315px; } -#dokuwiki__pagetools ul li a.source { +[dir=rtl] #dokuwiki__pagetools ul li a.source { background-position: left -360px; } -#dokuwiki__pagetools ul li a.source:hover, -#dokuwiki__pagetools ul li a.source:active, -#dokuwiki__pagetools ul li a.source:focus { +[dir=rtl] #dokuwiki__pagetools ul li a.source:hover, +[dir=rtl] #dokuwiki__pagetools ul li a.source:active, +[dir=rtl] #dokuwiki__pagetools ul li a.source:focus { background-position: left -405px; } -#dokuwiki__pagetools ul li a.draft { +[dir=rtl] #dokuwiki__pagetools ul li a.draft { background-position: left -180px; } -#dokuwiki__pagetools ul li a.draft:hover, -#dokuwiki__pagetools ul li a.draft:active, -#dokuwiki__pagetools ul li a.draft:focus { +[dir=rtl] #dokuwiki__pagetools ul li a.draft:hover, +[dir=rtl] #dokuwiki__pagetools ul li a.draft:active, +[dir=rtl] #dokuwiki__pagetools ul li a.draft:focus { background-position: left -225px; } -#dokuwiki__pagetools ul li a.revs { +[dir=rtl] #dokuwiki__pagetools ul li a.revs { background-position: left -540px; } -#dokuwiki__pagetools ul li a.revs:hover, -#dokuwiki__pagetools ul li a.revs:active, -#dokuwiki__pagetools ul li a.revs:focus, -.mode_revisions #dokuwiki__pagetools ul li a.revs { +[dir=rtl] #dokuwiki__pagetools ul li a.revs:hover, +[dir=rtl] #dokuwiki__pagetools ul li a.revs:active, +[dir=rtl] #dokuwiki__pagetools ul li a.revs:focus, +.mode_revisions [dir=rtl] #dokuwiki__pagetools ul li a.revs { background-position: left -585px; } -#dokuwiki__pagetools ul li a.backlink { +[dir=rtl] #dokuwiki__pagetools ul li a.backlink { background-position: left -630px; } -#dokuwiki__pagetools ul li a.backlink:hover, -#dokuwiki__pagetools ul li a.backlink:active, -#dokuwiki__pagetools ul li a.backlink:focus, -.mode_backlink #dokuwiki__pagetools ul li a.backlink { +[dir=rtl] #dokuwiki__pagetools ul li a.backlink:hover, +[dir=rtl] #dokuwiki__pagetools ul li a.backlink:active, +[dir=rtl] #dokuwiki__pagetools ul li a.backlink:focus, +.mode_backlink [dir=rtl] #dokuwiki__pagetools ul li a.backlink { background-position: left -675px; } -#dokuwiki__pagetools ul li a.top { +[dir=rtl] #dokuwiki__pagetools ul li a.top { background-position: left -810px; } -#dokuwiki__pagetools ul li a.top:hover, -#dokuwiki__pagetools ul li a.top:active, -#dokuwiki__pagetools ul li a.top:focus { +[dir=rtl] #dokuwiki__pagetools ul li a.top:hover, +[dir=rtl] #dokuwiki__pagetools ul li a.top:active, +[dir=rtl] #dokuwiki__pagetools ul li a.top:focus { background-position: left -855px; } -#dokuwiki__pagetools ul li a.revert { +[dir=rtl] #dokuwiki__pagetools ul li a.revert { background-position: left -450px; } -#dokuwiki__pagetools ul li a.revert:hover, -#dokuwiki__pagetools ul li a.revert:active, -#dokuwiki__pagetools ul li a.revert:focus, -.mode_revert #dokuwiki__pagetools ul li a.revert { +[dir=rtl] #dokuwiki__pagetools ul li a.revert:hover, +[dir=rtl] #dokuwiki__pagetools ul li a.revert:active, +[dir=rtl] #dokuwiki__pagetools ul li a.revert:focus, +.mode_revert [dir=rtl] #dokuwiki__pagetools ul li a.revert { background-position: left -495px; } -#dokuwiki__pagetools ul li a.subscribe { +[dir=rtl] #dokuwiki__pagetools ul li a.subscribe { background-position: left -720px; } -#dokuwiki__pagetools ul li a.subscribe:hover, -#dokuwiki__pagetools ul li a.subscribe:active, -#dokuwiki__pagetools ul li a.subscribe:focus, -.mode_subscribe #dokuwiki__pagetools ul li a.subscribe { +[dir=rtl] #dokuwiki__pagetools ul li a.subscribe:hover, +[dir=rtl] #dokuwiki__pagetools ul li a.subscribe:active, +[dir=rtl] #dokuwiki__pagetools ul li a.subscribe:focus, +.mode_subscribe [dir=rtl] #dokuwiki__pagetools ul li a.subscribe { background-position: left -765px; } -#dokuwiki__pagetools ul li a.mediaManager { +[dir=rtl] #dokuwiki__pagetools ul li a.mediaManager { background-position: left -900px; } -#dokuwiki__pagetools ul li a.mediaManager:hover, -#dokuwiki__pagetools ul li a.mediaManager:active, -#dokuwiki__pagetools ul li a.mediaManager:focus { +[dir=rtl] #dokuwiki__pagetools ul li a.mediaManager:hover, +[dir=rtl] #dokuwiki__pagetools ul li a.mediaManager:active, +[dir=rtl] #dokuwiki__pagetools ul li a.mediaManager:focus { background-position: left -945px; } -#dokuwiki__pagetools ul li a.back { +[dir=rtl] #dokuwiki__pagetools ul li a.back { background-position: left -990px; } -#dokuwiki__pagetools ul li a.back:hover, -#dokuwiki__pagetools ul li a.back:active, -#dokuwiki__pagetools ul li a.back:focus { +[dir=rtl] #dokuwiki__pagetools ul li a.back:hover, +[dir=rtl] #dokuwiki__pagetools ul li a.back:active, +[dir=rtl] #dokuwiki__pagetools ul li a.back:focus { background-position: left -1035px; } @@ -493,26 +501,26 @@ form#subscribe__form fieldset { /*____________ content ____________*/ /* section indenting -.dokuwiki .page h1 {margin-left: 0; margin-right: 0;} -.dokuwiki .page h2 {margin-left: 0; margin-right: .666em;} -.dokuwiki .page h3 {margin-left: 0; margin-right: 1.776em;} -.dokuwiki .page h4 {margin-left: 0; margin-right: 3em;} -.dokuwiki .page h5 {margin-left: 0; margin-right: 4.5712em;} -.dokuwiki .page div.level1 {margin-left: 0; margin-right: 0;} -.dokuwiki .page div.level2 {margin-left: 0; margin-right: 1em;} -.dokuwiki .page div.level3 {margin-left: 0; margin-right: 2em;} -.dokuwiki .page div.level4 {margin-left: 0; margin-right: 3em;} -.dokuwiki .page div.level5 {margin-left: 0; margin-right: 4em;} +[dir=rtl] .dokuwiki .page h1 {margin-left: 0; margin-right: 0;} +[dir=rtl] .dokuwiki .page h2 {margin-left: 0; margin-right: .666em;} +[dir=rtl] .dokuwiki .page h3 {margin-left: 0; margin-right: 1.776em;} +[dir=rtl] .dokuwiki .page h4 {margin-left: 0; margin-right: 3em;} +[dir=rtl] .dokuwiki .page h5 {margin-left: 0; margin-right: 4.5712em;} +[dir=rtl] .dokuwiki .page div.level1 {margin-left: 0; margin-right: 0;} +[dir=rtl] .dokuwiki .page div.level2 {margin-left: 0; margin-right: 1em;} +[dir=rtl] .dokuwiki .page div.level3 {margin-left: 0; margin-right: 2em;} +[dir=rtl] .dokuwiki .page div.level4 {margin-left: 0; margin-right: 3em;} +[dir=rtl] .dokuwiki .page div.level5 {margin-left: 0; margin-right: 4em;} */ -.dokuwiki dl.code dt, -.dokuwiki dl.file dt { +[dir=rtl] .dokuwiki dl.code dt, +[dir=rtl] .dokuwiki dl.file dt { margin-left: 0; margin-right: 1em; } -.JSpopup ul, -.JSpopup ol { +[dir=rtl] .JSpopup ul, +[dir=rtl] .JSpopup ol { padding-right: 0; } @@ -522,12 +530,12 @@ form#subscribe__form fieldset { @media only screen and (max-width: 768px), only screen and (max-device-width: 960px) { -.hasSidebar #dokuwiki__content, -.hasSidebar #dokuwiki__content > .pad { +[dir=rtl] .hasSidebar #dokuwiki__content, +[dir=rtl] .hasSidebar #dokuwiki__content > .pad { margin-right: 0; } -.dokuwiki div.toc { +[dir=rtl] .dokuwiki div.toc { float: none; margin: 0 0 1em 0; border-right-width: 0; @@ -539,36 +547,36 @@ form#subscribe__form fieldset { @media only screen and (max-width: 480px), only screen and (max-device-width: 480px) { -#dokuwiki__header ul.a11y.skip { +[dir=rtl] #dokuwiki__header ul.a11y.skip { left: auto !important; right: 0 !important; float: left; padding-right: 0; } -#dokuwiki__header ul.a11y.skip li { +[dir=rtl] #dokuwiki__header ul.a11y.skip li { margin: 0 .35em 0 0; } -#dokuwiki__header .headings, -#dokuwiki__header .tools { +[dir=rtl] #dokuwiki__header .headings, +[dir=rtl] #dokuwiki__header .tools { float: none; text-align: right; width: auto; } -#dokuwiki__sitetools { +[dir=rtl] #dokuwiki__sitetools { text-align: right; } -#dokuwiki__sitetools form.search { +[dir=rtl] #dokuwiki__sitetools form.search { float: right; margin: 0 0 .2em .2em; } -#dokuwiki__header .mobileTools { +[dir=rtl] #dokuwiki__header .mobileTools { float: left; } -.dokuwiki label.block { +[dir=rtl] .dokuwiki label.block { text-align: right; } diff --git a/lib/tpl/dokuwiki/style.ini b/lib/tpl/dokuwiki/style.ini index 8ac4fbe31..b8e55bcc8 100644 --- a/lib/tpl/dokuwiki/style.ini +++ b/lib/tpl/dokuwiki/style.ini @@ -30,8 +30,8 @@ css/pagetools.css = screen css/content.css = screen css/includes.css = screen css/mobile.css = screen +css/rtl.css = screen -css/rtl.css = rtl css/print.css = print -- cgit v1.2.3 From efba7aa366d89abfa91f142ff60fe2a33322307e Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Thu, 23 Feb 2012 04:17:14 +0000 Subject: improved closed item in sitemap for RTL languages --- lib/tpl/dokuwiki/css/rtl.css | 3 +++ lib/tpl/dokuwiki/images/closed-rtl.png | Bin 0 -> 170 bytes 2 files changed, 3 insertions(+) create mode 100644 lib/tpl/dokuwiki/images/closed-rtl.png diff --git a/lib/tpl/dokuwiki/css/rtl.css b/lib/tpl/dokuwiki/css/rtl.css index 8a6a9f631..baad02758 100644 --- a/lib/tpl/dokuwiki/css/rtl.css +++ b/lib/tpl/dokuwiki/css/rtl.css @@ -144,6 +144,9 @@ [dir=rtl] .dokuwiki ul.idx { padding-right: 0; } +[dir=rtl] .dokuwiki ul.idx li.closed { + list-style-image: url(images/closed-rtl.png); +} /*____________ _footnotes ____________*/ diff --git a/lib/tpl/dokuwiki/images/closed-rtl.png b/lib/tpl/dokuwiki/images/closed-rtl.png new file mode 100644 index 000000000..85ebd59e1 Binary files /dev/null and b/lib/tpl/dokuwiki/images/closed-rtl.png differ -- cgit v1.2.3 From 4a9189579406eb0fc9e00d96592e5589b648e42f Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Thu, 23 Feb 2012 04:31:16 +0000 Subject: removed left spacing of recent changes list in mobile view --- lib/tpl/dokuwiki/css/mobile.css | 6 ++++++ lib/tpl/dokuwiki/css/rtl.css | 5 +++++ 2 files changed, 11 insertions(+) diff --git a/lib/tpl/dokuwiki/css/mobile.css b/lib/tpl/dokuwiki/css/mobile.css index 1239a90a3..e1052f437 100644 --- a/lib/tpl/dokuwiki/css/mobile.css +++ b/lib/tpl/dokuwiki/css/mobile.css @@ -64,6 +64,12 @@ padding: 1em; } +/* _recent */ +.dokuwiki #dw__recent ul, +.dokuwiki #page__revisions ul { + padding-left: 0; +} + } /* /@media */ diff --git a/lib/tpl/dokuwiki/css/rtl.css b/lib/tpl/dokuwiki/css/rtl.css index baad02758..e0f81bb21 100644 --- a/lib/tpl/dokuwiki/css/rtl.css +++ b/lib/tpl/dokuwiki/css/rtl.css @@ -544,6 +544,11 @@ border-right-width: 0; } +[dir=rtl] .dokuwiki #dw__recent ul, +[dir=rtl] .dokuwiki #page__revisions ul { + padding-right: 0; +} + } /* /@media */ -- cgit v1.2.3 From 20f04039e631c2cfd34d22e124d2b9d9b94a19d6 Mon Sep 17 00:00:00 2001 From: Danny Date: Thu, 1 Mar 2012 20:54:28 +0800 Subject: Fix a stupid typo --- inc/parser/metadata.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/inc/parser/metadata.php b/inc/parser/metadata.php index 9b4c6b8da..8bfdc3b9c 100644 --- a/inc/parser/metadata.php +++ b/inc/parser/metadata.php @@ -459,7 +459,7 @@ class Doku_Renderer_metadata extends Doku_Renderer { if($title['title']) return '['.$title['title'].']'; } else if (is_null($title) || trim($title)==''){ if (useHeading('content') && $id){ - $heading = p_get_first_heading($id,METADATA_DONT_RENDER)); + $heading = p_get_first_heading($id,METADATA_DONT_RENDER); if ($heading) return $heading; } return $default; -- cgit v1.2.3 From 1d901ab2e0bb93fd121685d355782e3672c0d96d Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Fri, 2 Mar 2012 07:53:45 +0100 Subject: fixed media only RSS feed when the SKIP_DELETED flag was set, no recent changes where returned for media only queries, becuase file checks where done on page files instead of media files --- inc/changelog.php | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/inc/changelog.php b/inc/changelog.php index 60f9b8657..24583b341 100644 --- a/inc/changelog.php +++ b/inc/changelog.php @@ -188,7 +188,7 @@ function getRecents($first,$num,$ns='',$flags=0){ // handle lines while ($lines_position >= 0 || (($flags & RECENTS_MEDIA_PAGES_MIXED) && $media_lines_position >=0)) { if (empty($rec) && $lines_position >= 0) { - $rec = _handleRecent(@$lines[$lines_position], $ns, $flags & ~RECENTS_MEDIA_CHANGES, $seen); + $rec = _handleRecent(@$lines[$lines_position], $ns, $flags, $seen); if (!$rec) { $lines_position --; continue; @@ -197,8 +197,8 @@ function getRecents($first,$num,$ns='',$flags=0){ if (($flags & RECENTS_MEDIA_PAGES_MIXED) && empty($media_rec) && $media_lines_position >= 0) { $media_rec = _handleRecent(@$media_lines[$media_lines_position], $ns, $flags | RECENTS_MEDIA_CHANGES, $seen); if (!$media_rec) { - $media_lines_position --; - continue; + $media_lines_position --; + continue; } } if (($flags & RECENTS_MEDIA_PAGES_MIXED) && @$media_rec['date'] >= @$rec['date']) { @@ -320,8 +320,10 @@ function _handleRecent($line,$ns,$flags,&$seen){ if ($recent['perms'] < AUTH_READ) return false; // check existance - $fn = (($flags & RECENTS_MEDIA_CHANGES) ? mediaFN($recent['id']) : wikiFN($recent['id'])); - if((!@file_exists($fn)) && ($flags & RECENTS_SKIP_DELETED)) return false; + if($flags & RECENTS_SKIP_DELETED){ + $fn = (($flags & RECENTS_MEDIA_CHANGES) ? mediaFN($recent['id']) : wikiFN($recent['id'])); + if(!@file_exists($fn)) return false; + } return $recent; } -- cgit v1.2.3 From a7c93226bd0fa1293e1dc99e679390dc2f8d803c Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Fri, 2 Mar 2012 08:08:29 +0100 Subject: make RSS contents (media/pages) configurable --- conf/dokuwiki.php | 8 ++++++-- feed.php | 4 ++-- lib/plugins/config/lang/en/lang.php | 1 + lib/plugins/config/settings/config.metadata.php | 3 ++- 4 files changed, 11 insertions(+), 5 deletions(-) diff --git a/conf/dokuwiki.php b/conf/dokuwiki.php index 7a7e4bf1a..8da818638 100644 --- a/conf/dokuwiki.php +++ b/conf/dokuwiki.php @@ -127,14 +127,18 @@ $conf['rss_linkto'] = 'diff'; //what page RSS entries link to: // 'page' - the revised page itself // 'rev' - page showing all revisions // 'current' - most recent revision of page -$conf['rss_content'] = 'abstract'; // what to put in the items by default? +$conf['rss_content'] = 'abstract'; //what to put in the items by default? // 'abstract' - plain text, first paragraph or so // 'diff' - plain text unified diff wrapped in 
     tags
                                          //  'htmldiff' - diff as HTML table
                                          //  'html'     - the full page rendered in XHTML
+$conf['rss_media']   = 'both';           //what should be listed?
+                                         //  'both'     - page and media changes
+                                         //  'pages'    - page changes only
+                                         //  'media'    - media changes only
 $conf['rss_update'] = 5*60;              //Update the RSS feed every n seconds (defaults to 5 minutes)
-$conf['recent_days'] = 7;                //How many days of recent changes to keep. (days)
 $conf['rss_show_summary'] = 1;           //Add revision summary to title? 0|1
+$conf['recent_days'] = 7;                //How many days of recent changes to keep. (days)
 $conf['broken_iua']  = 0;                //Platform with broken ignore_user_abort (IIS+CGI) 0|1
 $conf['xsendfile']   = 0;                //Use X-Sendfile (1 = lighttpd, 2 = standard)
 $conf['renderer_xhtml'] = 'xhtml';       //renderer to use for main page generation
diff --git a/feed.php b/feed.php
index a7fa95620..98d5ef2e8 100644
--- a/feed.php
+++ b/feed.php
@@ -117,8 +117,8 @@ function rss_parseOptions(){
                   'show_minor'   => array('minor', false),
                   // String, only used in search mode
                   'search_query' => array('q', null),
-                // One of: pages, media, both
-                  'content_type' => array('view', 'both')
+                  // One of: pages, media, both
+                  'content_type' => array('view', $conf['rss_media'])
 
                  ) as $name => $val) {
         $opt[$name] = (isset($_REQUEST[$val[0]]) && !empty($_REQUEST[$val[0]]))
diff --git a/lib/plugins/config/lang/en/lang.php b/lib/plugins/config/lang/en/lang.php
index 74ec56345..8718b00ed 100644
--- a/lib/plugins/config/lang/en/lang.php
+++ b/lib/plugins/config/lang/en/lang.php
@@ -154,6 +154,7 @@ $lang['rss_content'] = 'What to display in the XML feed items?';
 $lang['rss_update']  = 'XML feed update interval (sec)';
 $lang['recent_days'] = 'How many recent changes to keep (days)';
 $lang['rss_show_summary'] = 'XML feed show summary in title';
+$lang['rss_media']   = 'What kind of changes should be listed in the XML feed?';
 
 /* Target options */
 $lang['target____wiki']      = 'Target window for internal links';
diff --git a/lib/plugins/config/settings/config.metadata.php b/lib/plugins/config/settings/config.metadata.php
index af815e8dc..83f47130c 100644
--- a/lib/plugins/config/settings/config.metadata.php
+++ b/lib/plugins/config/settings/config.metadata.php
@@ -192,9 +192,10 @@ $meta['sitemap']     = array('numeric');
 $meta['rss_type']    = array('multichoice','_choices' => array('rss','rss1','rss2','atom','atom1'));
 $meta['rss_linkto']  = array('multichoice','_choices' => array('diff','page','rev','current'));
 $meta['rss_content'] = array('multichoice','_choices' => array('abstract','diff','htmldiff','html'));
+$meta['rss_media']   = array('multichoice','_choices' => array('both','pages','media'));
 $meta['rss_update']  = array('numeric');
-$meta['recent_days'] = array('numeric');
 $meta['rss_show_summary'] = array('onoff');
+$meta['recent_days'] = array('numeric');
 $meta['broken_iua']  = array('onoff');
 $meta['xsendfile']   = array('multichoice','_choices' => array(0,1,2,3));
 $meta['renderer_xhtml'] = array('renderer','_format' => 'xhtml','_choices' => array('xhtml'));
-- 
cgit v1.2.3


From 44dae8a743d9c3d83f22e6f38a1685c8326a3b62 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bohum=C3=ADr=20Z=C3=A1me=C4=8Dn=C3=ADk?=
 
Date: Sun, 4 Mar 2012 17:49:09 +0100
Subject: Czech language update

---
 inc/lang/cs/lang.php                     | 6 ++++++
 lib/plugins/acl/lang/cs/lang.php         | 1 +
 lib/plugins/config/lang/cs/lang.php      | 1 +
 lib/plugins/plugin/lang/cs/lang.php      | 1 +
 lib/plugins/popularity/lang/cs/lang.php  | 1 +
 lib/plugins/revert/lang/cs/lang.php      | 1 +
 lib/plugins/usermanager/lang/cs/lang.php | 1 +
 7 files changed, 12 insertions(+)

diff --git a/inc/lang/cs/lang.php b/inc/lang/cs/lang.php
index badd57ac5..55e891863 100644
--- a/inc/lang/cs/lang.php
+++ b/inc/lang/cs/lang.php
@@ -11,6 +11,7 @@
  * @author Lefty 
  * @author Vojta Beran 
  * @author zbynek.krivka@seznam.cz
+ * @author Bohumir Zamecnik 
  */
 $lang['encoding']              = 'utf-8';
 $lang['direction']             = 'ltr';
@@ -190,6 +191,11 @@ $lang['external_edit']         = 'upraveno mimo DokuWiki';
 $lang['summary']               = 'Komentář k úpravám';
 $lang['noflash']               = 'Pro přehrání obsahu potřebujete Adobe Flash Plugin.';
 $lang['download']              = 'Stáhnout snippet';
+$lang['tools']                 = 'Nástroje';
+$lang['user_tools']            = 'Uživatelské nástroje';
+$lang['site_tools']            = 'Nástroje pro tento web';
+$lang['page_tools']            = 'Nástroje pro stránku';
+$lang['skip_to_content']       = 'jít k obsahu';
 $lang['mail_newpage']          = 'nová stránka:';
 $lang['mail_changed']          = 'změna stránky:';
 $lang['mail_subscribe_list']   = 'stránky změněné ve jmenném prostoru:';
diff --git a/lib/plugins/acl/lang/cs/lang.php b/lib/plugins/acl/lang/cs/lang.php
index cc1d97023..a1dce0369 100644
--- a/lib/plugins/acl/lang/cs/lang.php
+++ b/lib/plugins/acl/lang/cs/lang.php
@@ -10,6 +10,7 @@
  * @author Lefty 
  * @author Vojta Beran 
  * @author zbynek.krivka@seznam.cz
+ * @author Bohumir Zamecnik 
  */
 $lang['admin_acl']             = 'Správa přístupových práv';
 $lang['acl_group']             = 'Skupina';
diff --git a/lib/plugins/config/lang/cs/lang.php b/lib/plugins/config/lang/cs/lang.php
index bf87e99d5..578198d86 100644
--- a/lib/plugins/config/lang/cs/lang.php
+++ b/lib/plugins/config/lang/cs/lang.php
@@ -10,6 +10,7 @@
  * @author Lefty 
  * @author Vojta Beran 
  * @author zbynek.krivka@seznam.cz
+ * @author Bohumir Zamecnik 
  */
 $lang['menu']                  = 'Správa nastavení';
 $lang['error']                 = 'Nastavení nebyla změněna kvůli alespoň jedné neplatné položce,
diff --git a/lib/plugins/plugin/lang/cs/lang.php b/lib/plugins/plugin/lang/cs/lang.php
index 0ccabf344..1fd360dca 100644
--- a/lib/plugins/plugin/lang/cs/lang.php
+++ b/lib/plugins/plugin/lang/cs/lang.php
@@ -11,6 +11,7 @@
  * @author Lefty 
  * @author Vojta Beran 
  * @author zbynek.krivka@seznam.cz
+ * @author Bohumir Zamecnik 
  */
 $lang['menu']                  = 'Správa pluginů';
 $lang['download']              = 'Stáhnout a instalovat plugin';
diff --git a/lib/plugins/popularity/lang/cs/lang.php b/lib/plugins/popularity/lang/cs/lang.php
index 287bcf3b0..d7c58af2e 100644
--- a/lib/plugins/popularity/lang/cs/lang.php
+++ b/lib/plugins/popularity/lang/cs/lang.php
@@ -8,6 +8,7 @@
  * @author Lefty 
  * @author Vojta Beran 
  * @author zbynek.krivka@seznam.cz
+ * @author Bohumir Zamecnik 
  */
 $lang['name']                  = 'Průzkum používání (může chviličku trvat, než se natáhne)';
 $lang['submit']                = 'Odeslat data';
diff --git a/lib/plugins/revert/lang/cs/lang.php b/lib/plugins/revert/lang/cs/lang.php
index cf19381c8..5414ea1e5 100644
--- a/lib/plugins/revert/lang/cs/lang.php
+++ b/lib/plugins/revert/lang/cs/lang.php
@@ -11,6 +11,7 @@
  * @author Lefty 
  * @author Vojta Beran 
  * @author zbynek.krivka@seznam.cz
+ * @author Bohumir Zamecnik 
  */
 $lang['menu']                  = 'Obnova zaspamovaných stránek';
 $lang['filter']                = 'Hledat zaspamované stránky';
diff --git a/lib/plugins/usermanager/lang/cs/lang.php b/lib/plugins/usermanager/lang/cs/lang.php
index fe54d4cce..8351c190b 100644
--- a/lib/plugins/usermanager/lang/cs/lang.php
+++ b/lib/plugins/usermanager/lang/cs/lang.php
@@ -10,6 +10,7 @@
  * @author Lefty 
  * @author Vojta Beran 
  * @author zbynek.krivka@seznam.cz
+ * @author Bohumir Zamecnik 
  */
 $lang['menu']                  = 'Správa uživatelů';
 $lang['noauth']                = '(autentizace uživatelů není k dispozici)';
-- 
cgit v1.2.3


From d51d5583294017b72fa7ba2f709ec14961b1bc41 Mon Sep 17 00:00:00 2001
From: Chris--S 
Date: Tue, 6 Mar 2012 18:27:04 +0000
Subject: Improve grammar in the syntax highlighting paragraph

---
 data/pages/wiki/syntax.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/pages/wiki/syntax.txt b/data/pages/wiki/syntax.txt
index b03435787..0b5480949 100644
--- a/data/pages/wiki/syntax.txt
+++ b/data/pages/wiki/syntax.txt
@@ -368,7 +368,7 @@ Those blocks were created by this source:
 
 ==== Syntax Highlighting ====
 
-[[wiki:DokuWiki]] can highlight sourcecode, which makes it easier to read. It uses the [[http://qbnz.com/highlighter/|GeSHi]] Generic Syntax Highlighter -- so any language supported by GeSHi is supported. The syntax is the same like in the code and file blocks in the previous section, but this time the name of the used language is inserted inside the tag. Eg. '''' or ''''.
+[[wiki:DokuWiki]] can highlight sourcecode, which makes it easier to read. It uses the [[http://qbnz.com/highlighter/|GeSHi]] Generic Syntax Highlighter -- so any language supported by GeSHi is supported. The syntax uses the same code and file blocks described in the previous section, but this time the name of the language syntax to be highlighted is included inside the tag, e.g. '''' or ''''.
 
 
 /**
-- 
cgit v1.2.3


From bfdeb23f1844dffca054cb9c17c31a2151d3d9ea Mon Sep 17 00:00:00 2001
From: lupo49 
Date: Wed, 7 Mar 2012 19:58:33 +0100
Subject: Parser: Allow parser to fully recognize windows share links with a
 hyphen character in it (Currently, the clickable link stops before a hyphen
 character)

---
 inc/parser/parser.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/inc/parser/parser.php b/inc/parser/parser.php
index 68d4e4569..cf132ce97 100644
--- a/inc/parser/parser.php
+++ b/inc/parser/parser.php
@@ -929,7 +929,7 @@ class Doku_Parser_Mode_windowssharelink extends Doku_Parser_Mode {
     var $pattern;
 
     function preConnect() {
-        $this->pattern = "\\\\\\\\\w+?(?:\\\\[\w$]+)+";
+        $this->pattern = "\\\\\\\\\w+?(?:\\\\[\w-$]+)+";
     }
 
     function connectTo($mode) {
-- 
cgit v1.2.3


From 7980e1acf1a671646747e5b924f2c8e208280a2e Mon Sep 17 00:00:00 2001
From: Guy Brand 
Date: Wed, 7 Mar 2012 20:19:29 +0100
Subject: Add link to view non images files in media manager (FS#2439)

---
 inc/template.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/inc/template.php b/inc/template.php
index c23fd14c1..d9a2042ad 100644
--- a/inc/template.php
+++ b/inc/template.php
@@ -1232,7 +1232,7 @@ function tpl_mediaFileDetails($image, $rev){
     list($ext,$mime,$dl) = mimetype($image,false);
     $class = preg_replace('/[^_\-a-z0-9]+/i','_',$ext);
     $class = 'select mediafile mf_'.$class;
-    $tabTitle = ''.$image.'';
+    $tabTitle = ''.$image.''.'';
     if ($opened_tab === 'view' && $rev) {
         printf($lang['media_viewold'], $tabTitle, dformat($rev));
     } else {
-- 
cgit v1.2.3


From 1cbac89c9507d874eec8bd832f6ac734b3140471 Mon Sep 17 00:00:00 2001
From: Andreas Gohr 
Date: Sat, 10 Mar 2012 16:55:05 +0100
Subject: make new template the default

---
 conf/dokuwiki.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/conf/dokuwiki.php b/conf/dokuwiki.php
index 7a7e4bf1a..2eb43f535 100644
--- a/conf/dokuwiki.php
+++ b/conf/dokuwiki.php
@@ -27,7 +27,7 @@ $conf['mediarevisions'] = 1;              //enable/disable media revisions
 
 $conf['start']       = 'start';           //name of start page
 $conf['title']       = 'DokuWiki';        //what to show in the title
-$conf['template']    = 'default';         //see lib/tpl directory
+$conf['template']    = 'dokuwiki';        //see lib/tpl directory
 $conf['tagline']     = '';                //tagline in header (if template supports it)
 $conf['sidebar']     = 'sidebar';         //name of sidebar in root namespace (if template supports it)
 $conf['license']     = 'cc-by-nc-sa';     //see conf/license.php
-- 
cgit v1.2.3


From 80083a41ce7a4ccf3132621757c333c535179dbe Mon Sep 17 00:00:00 2001
From: Andreas Gohr 
Date: Sat, 10 Mar 2012 17:25:02 +0100
Subject: made tpl_license a bit more flexible

This way there's less custom code for the footer buttons needed
---
 inc/template.php | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/inc/template.php b/inc/template.php
index c23fd14c1..02e039b2d 100644
--- a/inc/template.php
+++ b/inc/template.php
@@ -1350,8 +1350,9 @@ function tpl_actiondropdown($empty='',$button='>'){
  * @author Andreas Gohr 
  * @param  string $img    - print image? (|button|badge)
  * @param  bool   $return - when true don't print, but return HTML
+ * @param  bool   $wrap   - wrap in div with class="license"?
  */
-function tpl_license($img='badge',$imgonly=false,$return=false){
+function tpl_license($img='badge',$imgonly=false,$return=false,$wrap=true){
     global $license;
     global $conf;
     global $lang;
@@ -1359,22 +1360,29 @@ function tpl_license($img='badge',$imgonly=false,$return=false){
     if(!is_array($license[$conf['license']])) return '';
     $lic = $license[$conf['license']];
 
-    $out  = '
    ';
+    $out = '';
+    if($wrap) $out  .= '
    ';
     if($img){
         $src = license_img($img);
         if($src){
+            if(!$imgonly){
+                $left = 'medialeft';
+            }else{
+                $left = '';
+            }
+
             $out .= ' ';
+            $out .= '>'.$lic['name'].' ';
         }
     }
     if(!$imgonly) {
         $out .= $lang['license'];
-        $out .= ' ';
     }
-    $out .= '
    ';
+    if($wrap) $out .= '
    ';
 
     if($return) return $out;
     echo $out;
-- 
cgit v1.2.3


From 0cec12dbebb29837b4bc322d5c1931cd79dc3848 Mon Sep 17 00:00:00 2001
From: Andreas Gohr 
Date: Sat, 10 Mar 2012 17:26:30 +0100
Subject: readded footer buttons from the old template

as discussed at https://github.com/splitbrain/dokuwiki/pull/82#r419699
---
 lib/tpl/dokuwiki/css/design.css           |  14 ++++++++++----
 lib/tpl/dokuwiki/images/button-css.png    | Bin 0 -> 299 bytes
 lib/tpl/dokuwiki/images/button-donate.gif | Bin 0 -> 187 bytes
 lib/tpl/dokuwiki/images/button-dw.png     | Bin 0 -> 404 bytes
 lib/tpl/dokuwiki/images/button-php.gif    | Bin 0 -> 207 bytes
 lib/tpl/dokuwiki/images/button-rss.png    | Bin 0 -> 191 bytes
 lib/tpl/dokuwiki/images/button-xhtml.png  | Bin 0 -> 321 bytes
 lib/tpl/dokuwiki/tpl_footer.php           |  15 ++++++++++++++-
 8 files changed, 24 insertions(+), 5 deletions(-)
 create mode 100644 lib/tpl/dokuwiki/images/button-css.png
 create mode 100644 lib/tpl/dokuwiki/images/button-donate.gif
 create mode 100644 lib/tpl/dokuwiki/images/button-dw.png
 create mode 100644 lib/tpl/dokuwiki/images/button-php.gif
 create mode 100644 lib/tpl/dokuwiki/images/button-rss.png
 create mode 100644 lib/tpl/dokuwiki/images/button-xhtml.png

diff --git a/lib/tpl/dokuwiki/css/design.css b/lib/tpl/dokuwiki/css/design.css
index 9e76be6ae..f80251dfe 100644
--- a/lib/tpl/dokuwiki/css/design.css
+++ b/lib/tpl/dokuwiki/css/design.css
@@ -453,11 +453,17 @@
 #dokuwiki__footer > .pad {
     font-size: 0.875em;
 }
-#dokuwiki__footer div.license {
+#dokuwiki__footer div.license,
+#dokuwiki__footer div.footerbuttons {
     text-align: center;
 }
-#dokuwiki__footer .license img {
-    margin: 0 .5em 0 0;
-    float: none;
+#dokuwiki__footer div.license {
+    margin-bottom: 0.5em;
+}
+#dokuwiki__footer div.footerbuttons img {
+    opacity: 0.5;
 }
 
+#dokuwiki__footer div.footerbuttons a:hover img {
+    opacity: 1;
+}
diff --git a/lib/tpl/dokuwiki/images/button-css.png b/lib/tpl/dokuwiki/images/button-css.png
new file mode 100644
index 000000000..706325e1c
Binary files /dev/null and b/lib/tpl/dokuwiki/images/button-css.png differ
diff --git a/lib/tpl/dokuwiki/images/button-donate.gif b/lib/tpl/dokuwiki/images/button-donate.gif
new file mode 100644
index 000000000..bba284e21
Binary files /dev/null and b/lib/tpl/dokuwiki/images/button-donate.gif differ
diff --git a/lib/tpl/dokuwiki/images/button-dw.png b/lib/tpl/dokuwiki/images/button-dw.png
new file mode 100644
index 000000000..97272d968
Binary files /dev/null and b/lib/tpl/dokuwiki/images/button-dw.png differ
diff --git a/lib/tpl/dokuwiki/images/button-php.gif b/lib/tpl/dokuwiki/images/button-php.gif
new file mode 100644
index 000000000..19aefb08f
Binary files /dev/null and b/lib/tpl/dokuwiki/images/button-php.gif differ
diff --git a/lib/tpl/dokuwiki/images/button-rss.png b/lib/tpl/dokuwiki/images/button-rss.png
new file mode 100644
index 000000000..f2438043f
Binary files /dev/null and b/lib/tpl/dokuwiki/images/button-rss.png differ
diff --git a/lib/tpl/dokuwiki/images/button-xhtml.png b/lib/tpl/dokuwiki/images/button-xhtml.png
new file mode 100644
index 000000000..ec686442c
Binary files /dev/null and b/lib/tpl/dokuwiki/images/button-xhtml.png differ
diff --git a/lib/tpl/dokuwiki/tpl_footer.php b/lib/tpl/dokuwiki/tpl_footer.php
index fcc9d21c7..e6fb7661d 100644
--- a/lib/tpl/dokuwiki/tpl_footer.php
+++ b/lib/tpl/dokuwiki/tpl_footer.php
@@ -1,6 +1,19 @@
 
 
    
-    
+        
+
+    
    
+
+        
+         href="http://www.dokuwiki.org/donate" title="Donate">Donate
+         href="http://www.php.net" title="Powered by PHP">Powered by PHP
+         href="http://validator.w3.org/check/referer" title="Valid XHTML 1.0">Valid XHTML 1.0
+         href="http://jigsaw.w3.org/css-validator/check/referer?profile=css3" title="Valid CSS">Valid CSS
+         href="http://dokuwiki.org/" title="Driven by DokuWiki">Driven by DokuWiki
+    
    
 
    
 
 
-- 
cgit v1.2.3


From 0b9869484e3052d68e5939bf626fbd3a840d3062 Mon Sep 17 00:00:00 2001
From: lupo49 
Date: Sat, 10 Mar 2012 20:16:28 +0100
Subject: Unit Test: Adding test to check windows share link with hyphen
 character

---
 _test/cases/inc/parser/parser_links.test.php | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/_test/cases/inc/parser/parser_links.test.php b/_test/cases/inc/parser/parser_links.test.php
index 53871e110..d0fb19570 100644
--- a/_test/cases/inc/parser/parser_links.test.php
+++ b/_test/cases/inc/parser/parser_links.test.php
@@ -400,6 +400,21 @@ class TestOfDoku_Parser_Links extends TestOfDoku_Parser {
         );
         $this->assertEqual(array_map('stripByteIndex',$this->H->calls),$calls);
     }
+    
+    function testWindowsShareLinkHyphen() {
+        $this->P->addMode('windowssharelink',new Doku_Parser_Mode_WindowsShareLink());
+        $this->P->parse('Foo \\\server\share-hyphen Bar');
+        $calls = array (
+        array('document_start',array()),
+        array('p_open',array()),
+        array('cdata',array("\n".'Foo ')),
+        array('windowssharelink',array('\\\server\share-hyphen',NULL)),
+        array('cdata',array(' Bar')),
+        array('p_close',array()),
+        array('document_end',array()),
+        );
+        $this->assertEqual(array_map('stripByteIndex',$this->H->calls),$calls);
+    }
 
     function testWindowsShareLinkInternal() {
         $this->P->addMode('internallink',new Doku_Parser_Mode_InternalLink());
-- 
cgit v1.2.3


From 53e15c8ba5cc2fd8ac7ed5a7f8dd4df684dba28a Mon Sep 17 00:00:00 2001
From: Anika Henke 
Date: Sat, 10 Mar 2012 20:58:38 +0000
Subject: improved tpl_license() (removed unnecessary class, fixed space
 issues)

---
 inc/template.php | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/inc/template.php b/inc/template.php
index 02e039b2d..37848b59a 100644
--- a/inc/template.php
+++ b/inc/template.php
@@ -1359,27 +1359,21 @@ function tpl_license($img='badge',$imgonly=false,$return=false,$wrap=true){
     if(!$conf['license']) return '';
     if(!is_array($license[$conf['license']])) return '';
     $lic = $license[$conf['license']];
+    $target = ($conf['target']['extern']) ? ' target="'.$conf['target']['extern'].'"' : '';
 
     $out = '';
     if($wrap) $out  .= '
    ';
     if($img){
         $src = license_img($img);
         if($src){
-            if(!$imgonly){
-                $left = 'medialeft';
-            }else{
-                $left = '';
-            }
-
-            $out .= ' ';
+            $out .= '';
+            if(!$imgonly) $out .= ' ';
         }
     }
     if(!$imgonly) {
-        $out .= $lang['license'];
-        $out .= '';
     }
     if($wrap) $out .= '
    ';
-- 
cgit v1.2.3


From a4380643ef4658cfe5340f5963a54a045a529c5b Mon Sep 17 00:00:00 2001
From: Anika Henke 
Date: Sat, 10 Mar 2012 21:04:15 +0000
Subject: improved footer readability and css

---
 lib/tpl/dokuwiki/css/design.css | 19 ++++++++-----------
 lib/tpl/dokuwiki/tpl_footer.php | 26 +++++++++++++++-----------
 2 files changed, 23 insertions(+), 22 deletions(-)

diff --git a/lib/tpl/dokuwiki/css/design.css b/lib/tpl/dokuwiki/css/design.css
index f80251dfe..6bf98b90d 100644
--- a/lib/tpl/dokuwiki/css/design.css
+++ b/lib/tpl/dokuwiki/css/design.css
@@ -283,10 +283,6 @@
 .dokuwiki div.license {
     font-size: 93.75%;
 }
-/* license note in footer */
-.dokuwiki #dokuwiki__footer div.license {
-    font-size: 100%;
-}
 
 #IE7 .dokuwiki input.button,
 #IE7 .dokuwiki button {
@@ -449,21 +445,22 @@
 
 #dokuwiki__footer {
     margin-bottom: 1em;
+    text-align: center;
 }
 #dokuwiki__footer > .pad {
     font-size: 0.875em;
 }
-#dokuwiki__footer div.license,
-#dokuwiki__footer div.footerbuttons {
-    text-align: center;
-}
+
 #dokuwiki__footer div.license {
     margin-bottom: 0.5em;
+    font-size: 100%;
 }
-#dokuwiki__footer div.footerbuttons img {
+
+#dokuwiki__footer div.buttons a img {
     opacity: 0.5;
 }
-
-#dokuwiki__footer div.footerbuttons a:hover img {
+#dokuwiki__footer div.buttons a:hover img,
+#dokuwiki__footer div.buttons a:active img,
+#dokuwiki__footer div.buttons a:focus img {
     opacity: 1;
 }
diff --git a/lib/tpl/dokuwiki/tpl_footer.php b/lib/tpl/dokuwiki/tpl_footer.php
index e6fb7661d..6b46234d6 100644
--- a/lib/tpl/dokuwiki/tpl_footer.php
+++ b/lib/tpl/dokuwiki/tpl_footer.php
@@ -1,18 +1,22 @@
 
 
    
+    
+
+    
    
         
-
-    
    
-
-        
-         href="http://www.dokuwiki.org/donate" title="Donate">Donate
-         href="http://www.php.net" title="Powered by PHP">Powered by PHP
-         href="http://validator.w3.org/check/referer" title="Valid XHTML 1.0">Valid XHTML 1.0
-         href="http://jigsaw.w3.org/css-validator/check/referer?profile=css3" title="Valid CSS">Valid CSS
-         href="http://dokuwiki.org/" title="Driven by DokuWiki">Driven by DokuWiki
+        >Donate
+        >Powered by PHP
+        >Valid XHTML 1.0
+        >Valid CSS
+        >Driven by DokuWiki
     
    
 
    
 
-- 
cgit v1.2.3


From 83112a8af043de8ff379b16483077b78ffe2204f Mon Sep 17 00:00:00 2001
From: Andreas Gohr 
Date: Sat, 10 Mar 2012 22:53:31 +0100
Subject: Build the pagetools sprite programatically with imagemagick

This makes it easier to modify or extend the icons in the sprite.
Just place the source files in the pagetools directory and run the build
script.
---
 lib/tpl/dokuwiki/images/pagetools-build.sh         |  56 +++++++++++++++++++++
 lib/tpl/dokuwiki/images/pagetools-license.txt      |   4 --
 lib/tpl/dokuwiki/images/pagetools-sprite.png       | Bin 14507 -> 10389 bytes
 lib/tpl/dokuwiki/images/pagetools-sprite.xcf       | Bin 34257 -> 0 bytes
 lib/tpl/dokuwiki/images/pagetools/01_edit.png      | Bin 0 -> 740 bytes
 lib/tpl/dokuwiki/images/pagetools/02_create.png    | Bin 0 -> 808 bytes
 lib/tpl/dokuwiki/images/pagetools/03_draft.png     | Bin 0 -> 828 bytes
 lib/tpl/dokuwiki/images/pagetools/04_show.png      | Bin 0 -> 458 bytes
 lib/tpl/dokuwiki/images/pagetools/05_source.png    | Bin 0 -> 753 bytes
 lib/tpl/dokuwiki/images/pagetools/06_revert.png    | Bin 0 -> 752 bytes
 lib/tpl/dokuwiki/images/pagetools/07_revisions.png | Bin 0 -> 1144 bytes
 lib/tpl/dokuwiki/images/pagetools/08_backlink.png  | Bin 0 -> 844 bytes
 lib/tpl/dokuwiki/images/pagetools/09_subscribe.png | Bin 0 -> 589 bytes
 lib/tpl/dokuwiki/images/pagetools/10_top.png       | Bin 0 -> 465 bytes
 .../dokuwiki/images/pagetools/11_mediamanager.png  | Bin 0 -> 441 bytes
 lib/tpl/dokuwiki/images/pagetools/12_back.png      | Bin 0 -> 483 bytes
 lib/tpl/dokuwiki/images/pagetools/license.txt      |   4 ++
 17 files changed, 60 insertions(+), 4 deletions(-)
 create mode 100755 lib/tpl/dokuwiki/images/pagetools-build.sh
 delete mode 100644 lib/tpl/dokuwiki/images/pagetools-license.txt
 delete mode 100644 lib/tpl/dokuwiki/images/pagetools-sprite.xcf
 create mode 100644 lib/tpl/dokuwiki/images/pagetools/01_edit.png
 create mode 100644 lib/tpl/dokuwiki/images/pagetools/02_create.png
 create mode 100644 lib/tpl/dokuwiki/images/pagetools/03_draft.png
 create mode 100644 lib/tpl/dokuwiki/images/pagetools/04_show.png
 create mode 100644 lib/tpl/dokuwiki/images/pagetools/05_source.png
 create mode 100644 lib/tpl/dokuwiki/images/pagetools/06_revert.png
 create mode 100644 lib/tpl/dokuwiki/images/pagetools/07_revisions.png
 create mode 100644 lib/tpl/dokuwiki/images/pagetools/08_backlink.png
 create mode 100644 lib/tpl/dokuwiki/images/pagetools/09_subscribe.png
 create mode 100644 lib/tpl/dokuwiki/images/pagetools/10_top.png
 create mode 100644 lib/tpl/dokuwiki/images/pagetools/11_mediamanager.png
 create mode 100644 lib/tpl/dokuwiki/images/pagetools/12_back.png
 create mode 100644 lib/tpl/dokuwiki/images/pagetools/license.txt

diff --git a/lib/tpl/dokuwiki/images/pagetools-build.sh b/lib/tpl/dokuwiki/images/pagetools-build.sh
new file mode 100755
index 000000000..202e222e9
--- /dev/null
+++ b/lib/tpl/dokuwiki/images/pagetools-build.sh
@@ -0,0 +1,56 @@
+#!/bin/sh
+#
+# This script generates a sprite from the unprocessed toolbar icons by combining them
+# and overlaying a color layer for the active state
+#
+# The final sprite is optimized with optipng
+#
+# The script currently expects a Linux system with current versions of the imagemagick
+# and optipng binaries in the path
+#
+# @author Andreas Gohr 
+
+OUT=`dirname $0`
+IN="$OUT/pagetools"
+
+if [ ! -d "$IN" ]; then
+    echo "Input folder $IN not found"
+    exit 1
+fi
+
+if [ -z "$TEMP" ]; then
+    TEMP="/tmp"
+fi
+
+if [ ! -d "$TEMP" ]; then
+    echo "No temp directory available"
+    exit 1
+fi
+
+# add up all images twice
+montage `for X in $IN/*.png; do echo -n "$X $X "; done`  -background transparent -tile 1x -geometry 30x45 -gravity north $TEMP/icons.png
+
+# darken the image
+convert $TEMP/icons.png \( +clone -fill '#cccccc' -colorize 100% \) -compose multiply -composite $TEMP/darkicons.png
+
+# create the mask to highlight an active icon
+convert -size 30x30 xc:'#2b73b7' -gamma 0.7 $TEMP/active.png
+
+# create the full mask
+montage `for X in $IN/*.png; do echo -n "$TEMP/active.png "; done` -background transparent -tile 1x -geometry 30x60+0+15 -gravity south $TEMP/activemask.png
+
+# apply mask
+convert $TEMP/darkicons.png $TEMP/activemask.png  \
+\( -clone 0 -alpha extract \) \
+\( -clone 0 -clone 1 -compose overlay -composite \) \
+-delete 0,1 +swap -alpha off -compose copy_opacity -composite $OUT/pagetools-sprite.png
+
+# optimize final sprite
+optipng -o5 $OUT/pagetools-sprite.png
+
+# remove temporary images
+rm -f $TEMP/icons.png
+rm -f $TEMP/darkicons.png
+rm -f $TEMP/active.png
+rm -f $TEMP/activemask.png
+
diff --git a/lib/tpl/dokuwiki/images/pagetools-license.txt b/lib/tpl/dokuwiki/images/pagetools-license.txt
deleted file mode 100644
index 299624c62..000000000
--- a/lib/tpl/dokuwiki/images/pagetools-license.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-Icon set:   iPhone toolbar icons
-Designer:   TheWorkingGroup.ca
-License:    Creative Commons Attribution-Share Alike License [http://creativecommons.org/licenses/by-sa/3.0/]
-URL:        http://blog.twg.ca/2009/09/free-iphone-toolbar-icons/
diff --git a/lib/tpl/dokuwiki/images/pagetools-sprite.png b/lib/tpl/dokuwiki/images/pagetools-sprite.png
index a0f4036ff..0e8b4a9bf 100644
Binary files a/lib/tpl/dokuwiki/images/pagetools-sprite.png and b/lib/tpl/dokuwiki/images/pagetools-sprite.png differ
diff --git a/lib/tpl/dokuwiki/images/pagetools-sprite.xcf b/lib/tpl/dokuwiki/images/pagetools-sprite.xcf
deleted file mode 100644
index 07c1d83fb..000000000
Binary files a/lib/tpl/dokuwiki/images/pagetools-sprite.xcf and /dev/null differ
diff --git a/lib/tpl/dokuwiki/images/pagetools/01_edit.png b/lib/tpl/dokuwiki/images/pagetools/01_edit.png
new file mode 100644
index 000000000..ad4a737d8
Binary files /dev/null and b/lib/tpl/dokuwiki/images/pagetools/01_edit.png differ
diff --git a/lib/tpl/dokuwiki/images/pagetools/02_create.png b/lib/tpl/dokuwiki/images/pagetools/02_create.png
new file mode 100644
index 000000000..e4fc5d3b1
Binary files /dev/null and b/lib/tpl/dokuwiki/images/pagetools/02_create.png differ
diff --git a/lib/tpl/dokuwiki/images/pagetools/03_draft.png b/lib/tpl/dokuwiki/images/pagetools/03_draft.png
new file mode 100644
index 000000000..a13d8c3b4
Binary files /dev/null and b/lib/tpl/dokuwiki/images/pagetools/03_draft.png differ
diff --git a/lib/tpl/dokuwiki/images/pagetools/04_show.png b/lib/tpl/dokuwiki/images/pagetools/04_show.png
new file mode 100644
index 000000000..6f64b1bd1
Binary files /dev/null and b/lib/tpl/dokuwiki/images/pagetools/04_show.png differ
diff --git a/lib/tpl/dokuwiki/images/pagetools/05_source.png b/lib/tpl/dokuwiki/images/pagetools/05_source.png
new file mode 100644
index 000000000..bcc4fa21f
Binary files /dev/null and b/lib/tpl/dokuwiki/images/pagetools/05_source.png differ
diff --git a/lib/tpl/dokuwiki/images/pagetools/06_revert.png b/lib/tpl/dokuwiki/images/pagetools/06_revert.png
new file mode 100644
index 000000000..7b8457e5e
Binary files /dev/null and b/lib/tpl/dokuwiki/images/pagetools/06_revert.png differ
diff --git a/lib/tpl/dokuwiki/images/pagetools/07_revisions.png b/lib/tpl/dokuwiki/images/pagetools/07_revisions.png
new file mode 100644
index 000000000..d918bce05
Binary files /dev/null and b/lib/tpl/dokuwiki/images/pagetools/07_revisions.png differ
diff --git a/lib/tpl/dokuwiki/images/pagetools/08_backlink.png b/lib/tpl/dokuwiki/images/pagetools/08_backlink.png
new file mode 100644
index 000000000..2c0823a72
Binary files /dev/null and b/lib/tpl/dokuwiki/images/pagetools/08_backlink.png differ
diff --git a/lib/tpl/dokuwiki/images/pagetools/09_subscribe.png b/lib/tpl/dokuwiki/images/pagetools/09_subscribe.png
new file mode 100644
index 000000000..30e039dbc
Binary files /dev/null and b/lib/tpl/dokuwiki/images/pagetools/09_subscribe.png differ
diff --git a/lib/tpl/dokuwiki/images/pagetools/10_top.png b/lib/tpl/dokuwiki/images/pagetools/10_top.png
new file mode 100644
index 000000000..e4bf1d49d
Binary files /dev/null and b/lib/tpl/dokuwiki/images/pagetools/10_top.png differ
diff --git a/lib/tpl/dokuwiki/images/pagetools/11_mediamanager.png b/lib/tpl/dokuwiki/images/pagetools/11_mediamanager.png
new file mode 100644
index 000000000..36116802f
Binary files /dev/null and b/lib/tpl/dokuwiki/images/pagetools/11_mediamanager.png differ
diff --git a/lib/tpl/dokuwiki/images/pagetools/12_back.png b/lib/tpl/dokuwiki/images/pagetools/12_back.png
new file mode 100644
index 000000000..d154651ec
Binary files /dev/null and b/lib/tpl/dokuwiki/images/pagetools/12_back.png differ
diff --git a/lib/tpl/dokuwiki/images/pagetools/license.txt b/lib/tpl/dokuwiki/images/pagetools/license.txt
new file mode 100644
index 000000000..299624c62
--- /dev/null
+++ b/lib/tpl/dokuwiki/images/pagetools/license.txt
@@ -0,0 +1,4 @@
+Icon set:   iPhone toolbar icons
+Designer:   TheWorkingGroup.ca
+License:    Creative Commons Attribution-Share Alike License [http://creativecommons.org/licenses/by-sa/3.0/]
+URL:        http://blog.twg.ca/2009/09/free-iphone-toolbar-icons/
-- 
cgit v1.2.3


From d43eb44110dd836cad0da96d1f027260c2581d89 Mon Sep 17 00:00:00 2001
From: Andreas Gohr 
Date: Sun, 11 Mar 2012 10:48:29 +0100
Subject: Another go at building the pagetool sprite with a script

This time PHP and libGD is used so it should work on Windows as well.
The image quality is much better this time and the active highlight
color is read directly from the template's style.ini
---
 lib/tpl/dokuwiki/images/pagetools-build.php  | 121 +++++++++++++++++++++++++++
 lib/tpl/dokuwiki/images/pagetools-build.sh   |  56 -------------
 lib/tpl/dokuwiki/images/pagetools-sprite.png | Bin 10389 -> 8178 bytes
 lib/tpl/dokuwiki/images/pagetools.xcf        | Bin 14393 -> 0 bytes
 4 files changed, 121 insertions(+), 56 deletions(-)
 create mode 100644 lib/tpl/dokuwiki/images/pagetools-build.php
 delete mode 100755 lib/tpl/dokuwiki/images/pagetools-build.sh
 delete mode 100644 lib/tpl/dokuwiki/images/pagetools.xcf

diff --git a/lib/tpl/dokuwiki/images/pagetools-build.php b/lib/tpl/dokuwiki/images/pagetools-build.php
new file mode 100644
index 000000000..1b7262ad5
--- /dev/null
+++ b/lib/tpl/dokuwiki/images/pagetools-build.php
@@ -0,0 +1,121 @@
+
+ * @todo   Maybe add some more error checking
+ */
+$GAMMA = 0.8;
+$OPTIPNG = '/usr/bin/optipng';
+
+// load input images
+$input = glob('pagetools/*.png');
+sort($input);
+$cnt   = count($input);
+if(!$cnt){
+    die("No input images found. This script needs to be called from within the image directory!\n");
+}
+
+// create destination image
+$DST = imagecreatetruecolor(30,$cnt*45*2);
+imagesavealpha($DST, true);
+$C_trans = imagecolorallocatealpha($DST, 0, 0, 0, 127);
+imagefill($DST, 0, 0, $C_trans);
+
+// load highlight color from style.ini
+$ini = parse_ini_file('../style.ini',true);
+$COLOR = hex2rgb($ini['replacements']['__link__']);
+$C_active = imagecolorallocate($DST, $COLOR['r'],$COLOR['g'],$COLOR['b']);
+
+// add all the icons to the sprite image
+for($i=0; $i<$cnt; $i++){
+    $base = $i*90;
+
+    $IN = imagecreatefrompng($input[$i]);
+    imagesavealpha($IN, true);
+    imagecolorscale($IN,$GAMMA);
+    imagecopy($DST,$IN, 0,$base, 0,0, 30,30);
+    imagedestroy($IN);
+
+    $IN = imagecreatefrompng($input[$i]);
+    imagesavealpha($IN, true);
+    imagecolorscale($IN,$GAMMA);
+    imagecopy($DST,$IN, 0,$base+45, 0,0, 30,30);
+    imagedestroy($IN);
+
+    imagelayereffect($DST, IMG_EFFECT_OVERLAY);
+    imagefilledrectangle($DST, 0,$base+45, 30,$base+45+30, $C_active);
+    imagelayereffect($DST, IMG_EFFECT_NORMAL);
+}
+
+// output sprite
+imagepng($DST,'pagetools-sprite.png');
+imagedestroy($DST);
+
+// optimize if possible
+if(is_executable($OPTIPNG)){
+    system("$OPTIPNG -o5 'pagetools-sprite.png'");
+}
+
+/**
+ * Convert a hex color code to an rgb array
+ */
+function hex2rgb($hex) {
+    // strip hash
+    $hex = str_replace('#', '', $hex);
+
+    // normalize short codes
+    if(strlen($hex) == 3){
+        $hex = substr($hex,0,1).
+               substr($hex,0,1).
+               substr($hex,1,1).
+               substr($hex,1,1).
+               substr($hex,2,1).
+               substr($hex,2,1);
+    }
+
+    // calc rgb
+    return array(
+       'r' => hexdec(substr($hex, 0, 2)),
+       'g' => hexdec(substr($hex, 2, 2)),
+       'b' => hexdec(substr($hex, 4, 2))
+    );
+}
+
+/**
+ * Scale (darken/lighten) a given image
+ *
+ * @param ressource $img    The truetype GD image to work on
+ * @param float     $scale  Scale the colors by this value ( <1 darkens, >1 lightens)
+ */
+function imagecolorscale(&$img, $scale){
+    $w = imagesx($img);
+    $h = imagesy($img);
+
+    imagealphablending($img, false);
+    for($x = 0; $x < $w; $x++){
+        for($y = 0; $y < $h; $y++){
+            $rgba   = imagecolorat($img, $x, $y);
+            $a = ($rgba >> 24) & 0xFF;
+            $r = ($rgba >> 16) & 0xFF;
+            $g = ($rgba >> 8) & 0xFF;
+            $b = $rgba & 0xFF;
+
+            $r = max(min(round($r*$scale),255),0);
+            $g = max(min(round($g*$scale),255),0);
+            $b = max(min(round($b*$scale),255),0);
+
+            $color = imagecolorallocatealpha($img, $r, $g, $b, $a);
+            imagesetpixel($img, $x, $y, $color);
+        }
+    }
+    imagealphablending($img, true);
+}
+
diff --git a/lib/tpl/dokuwiki/images/pagetools-build.sh b/lib/tpl/dokuwiki/images/pagetools-build.sh
deleted file mode 100755
index 202e222e9..000000000
--- a/lib/tpl/dokuwiki/images/pagetools-build.sh
+++ /dev/null
@@ -1,56 +0,0 @@
-#!/bin/sh
-#
-# This script generates a sprite from the unprocessed toolbar icons by combining them
-# and overlaying a color layer for the active state
-#
-# The final sprite is optimized with optipng
-#
-# The script currently expects a Linux system with current versions of the imagemagick
-# and optipng binaries in the path
-#
-# @author Andreas Gohr 
-
-OUT=`dirname $0`
-IN="$OUT/pagetools"
-
-if [ ! -d "$IN" ]; then
-    echo "Input folder $IN not found"
-    exit 1
-fi
-
-if [ -z "$TEMP" ]; then
-    TEMP="/tmp"
-fi
-
-if [ ! -d "$TEMP" ]; then
-    echo "No temp directory available"
-    exit 1
-fi
-
-# add up all images twice
-montage `for X in $IN/*.png; do echo -n "$X $X "; done`  -background transparent -tile 1x -geometry 30x45 -gravity north $TEMP/icons.png
-
-# darken the image
-convert $TEMP/icons.png \( +clone -fill '#cccccc' -colorize 100% \) -compose multiply -composite $TEMP/darkicons.png
-
-# create the mask to highlight an active icon
-convert -size 30x30 xc:'#2b73b7' -gamma 0.7 $TEMP/active.png
-
-# create the full mask
-montage `for X in $IN/*.png; do echo -n "$TEMP/active.png "; done` -background transparent -tile 1x -geometry 30x60+0+15 -gravity south $TEMP/activemask.png
-
-# apply mask
-convert $TEMP/darkicons.png $TEMP/activemask.png  \
-\( -clone 0 -alpha extract \) \
-\( -clone 0 -clone 1 -compose overlay -composite \) \
--delete 0,1 +swap -alpha off -compose copy_opacity -composite $OUT/pagetools-sprite.png
-
-# optimize final sprite
-optipng -o5 $OUT/pagetools-sprite.png
-
-# remove temporary images
-rm -f $TEMP/icons.png
-rm -f $TEMP/darkicons.png
-rm -f $TEMP/active.png
-rm -f $TEMP/activemask.png
-
diff --git a/lib/tpl/dokuwiki/images/pagetools-sprite.png b/lib/tpl/dokuwiki/images/pagetools-sprite.png
index 0e8b4a9bf..bbd7fd361 100644
Binary files a/lib/tpl/dokuwiki/images/pagetools-sprite.png and b/lib/tpl/dokuwiki/images/pagetools-sprite.png differ
diff --git a/lib/tpl/dokuwiki/images/pagetools.xcf b/lib/tpl/dokuwiki/images/pagetools.xcf
deleted file mode 100644
index 034b39a42..000000000
Binary files a/lib/tpl/dokuwiki/images/pagetools.xcf and /dev/null differ
-- 
cgit v1.2.3


From 3cc7f979e3049c367082b6c7be205c0d78a4b95f Mon Sep 17 00:00:00 2001
From: Anika Henke 
Date: Sun, 11 Mar 2012 12:08:35 +0000
Subject: made images fit better into the horizontal grid, and reduced side
 spacing a bit

---
 lib/tpl/dokuwiki/css/content.css | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/lib/tpl/dokuwiki/css/content.css b/lib/tpl/dokuwiki/css/content.css
index 4e9f8cbe1..c4374fb96 100644
--- a/lib/tpl/dokuwiki/css/content.css
+++ b/lib/tpl/dokuwiki/css/content.css
@@ -27,15 +27,16 @@
 
 /* embedded images (styles are already partly set in lib/styles/all.css) */
 .dokuwiki img.media {
+    margin: .2em 0;
 }
 .dokuwiki img.medialeft {
-    margin: .5em 1.5em .5em 0;
+    margin: .2em 1em .2em 0;
 }
 .dokuwiki img.mediaright {
-    margin: .5em 0 .5em 1.5em;
+    margin: .2em 0 .2em 1em;
 }
 .dokuwiki img.mediacenter {
-    margin: .5em auto;
+    margin: .2em auto;
 }
 
 
-- 
cgit v1.2.3


From 7c5f6a37b17b8743005677cf049f1c173407a055 Mon Sep 17 00:00:00 2001
From: Anika Henke 
Date: Sun, 11 Mar 2012 18:15:17 +0000
Subject: removed a few unnecessary classes and elements before IDs in styles

---
 lib/tpl/dokuwiki/css/_forms.css  |  6 +++---
 lib/tpl/dokuwiki/css/_search.css |  2 +-
 lib/tpl/dokuwiki/css/content.css | 12 ++++++------
 lib/tpl/dokuwiki/css/design.css  |  4 ++--
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/lib/tpl/dokuwiki/css/_forms.css b/lib/tpl/dokuwiki/css/_forms.css
index 804584725..39a1ec5d3 100644
--- a/lib/tpl/dokuwiki/css/_forms.css
+++ b/lib/tpl/dokuwiki/css/_forms.css
@@ -65,18 +65,18 @@
  * Styles for the subscription page
  */
 
-form#subscribe__form {
+#subscribe__form {
     display: block;
     width: 400px;
     text-align: center;
 }
 
-form#subscribe__form fieldset {
+#subscribe__form fieldset {
     text-align: left;
     margin: 0.5em 0;
 }
 
-form#subscribe__form label {
+#subscribe__form label {
     display: block;
     margin: 0 0.5em 0.5em;
 }
diff --git a/lib/tpl/dokuwiki/css/_search.css b/lib/tpl/dokuwiki/css/_search.css
index 70824fc43..c124c1e86 100644
--- a/lib/tpl/dokuwiki/css/_search.css
+++ b/lib/tpl/dokuwiki/css/_search.css
@@ -7,7 +7,7 @@
 ********************************************************************/
 
 /* loading gif */
-.dokuwiki #dw__loading {
+#dw__loading {
 }
 
 /*____________ matching pagenames ____________*/
diff --git a/lib/tpl/dokuwiki/css/content.css b/lib/tpl/dokuwiki/css/content.css
index c4374fb96..ca2294950 100644
--- a/lib/tpl/dokuwiki/css/content.css
+++ b/lib/tpl/dokuwiki/css/content.css
@@ -42,16 +42,16 @@
 
 /*____________ lists ____________*/
 
-.dokuwiki #dokuwiki__content ul li,
-.dokuwiki #dokuwiki__aside ul li {
+#dokuwiki__content ul li,
+#dokuwiki__aside ul li {
     color: __text_alt__;
 }
-.dokuwiki #dokuwiki__content ol li,
-.dokuwiki #dokuwiki__aside ol li {
+#dokuwiki__content ol li,
+#dokuwiki__aside ol li {
     color: __text_neu__;
 }
-.dokuwiki #dokuwiki__content li .li,
-.dokuwiki #dokuwiki__aside li .li {
+#dokuwiki__content li .li,
+#dokuwiki__aside li .li {
     color: __text__;
 }
 
diff --git a/lib/tpl/dokuwiki/css/design.css b/lib/tpl/dokuwiki/css/design.css
index 6bf98b90d..a741de355 100644
--- a/lib/tpl/dokuwiki/css/design.css
+++ b/lib/tpl/dokuwiki/css/design.css
@@ -293,10 +293,10 @@
     margin: 0;
 }
 
-.dokuwiki #dokuwiki__content span.curid a {
+#dokuwiki__content span.curid a {
     font-weight: normal;
 }
-.dokuwiki #dokuwiki__content strong span.curid a {
+#dokuwiki__content strong span.curid a {
     font-weight: bold;
 }
 
-- 
cgit v1.2.3


From 693e373640c188e34d63ff4957cb20bccffdeb17 Mon Sep 17 00:00:00 2001
From: Anika Henke 
Date: Sun, 11 Mar 2012 18:17:35 +0000
Subject: made print styles more readable and changed media classes to the same
 as in 3cc7f979e3

---
 lib/tpl/dokuwiki/css/print.css | 101 +++++++++++++++++++++++++++++++----------
 1 file changed, 77 insertions(+), 24 deletions(-)

diff --git a/lib/tpl/dokuwiki/css/print.css b/lib/tpl/dokuwiki/css/print.css
index d20d0f464..f4f81d741 100644
--- a/lib/tpl/dokuwiki/css/print.css
+++ b/lib/tpl/dokuwiki/css/print.css
@@ -14,26 +14,51 @@ body {
 
 /* hide certain sections */
 .a11y,
-div.notify, div.info, div.success, div.error,
-#dokuwiki__header .tools, #dokuwiki__aside,
-.dokuwiki .breadcrumbs, .dokuwiki .toc, .dokuwiki .secedit,
-#dokuwiki__pagetools, #dokuwiki__footer {
+div.notify,
+div.info,
+div.success,
+div.error,
+#dokuwiki__header .tools,
+#dokuwiki__aside,
+.dokuwiki .breadcrumbs,
+.dokuwiki .toc,
+.dokuwiki .secedit,
+#dokuwiki__pagetools,
+#dokuwiki__footer {
     display: none;
 }
 
-.dokuwiki h1, .dokuwiki h2, .dokuwiki h3, .dokuwiki h4, .dokuwiki h5,
-.dokuwiki caption, .dokuwiki legend {
+.dokuwiki h1,
+.dokuwiki h2,
+.dokuwiki h3,
+.dokuwiki h4,
+.dokuwiki h5,
+.dokuwiki caption,
+.dokuwiki legend {
     clear: both;
 }
-.dokuwiki ul             { list-style: disc outside; }
-.dokuwiki ol             { list-style: decimal outside; }
-.dokuwiki ol ol          { list-style-type: lower-alpha; }
-.dokuwiki ol ol ol       { list-style-type: upper-roman; }
-.dokuwiki ol ol ol ol    { list-style-type: upper-alpha; }
-.dokuwiki ol ol ol ol ol { list-style-type: lower-roman; }
+.dokuwiki ul {
+    list-style: disc outside;
+}
+.dokuwiki ol {
+    list-style: decimal outside;
+}
+.dokuwiki ol ol {
+    list-style-type: lower-alpha;
+}
+.dokuwiki ol ol ol {
+    list-style-type: upper-roman;
+}
+.dokuwiki ol ol ol ol {
+    list-style-type: upper-alpha;
+}
+.dokuwiki ol ol ol ol ol {
+    list-style-type: lower-roman;
+}
 
 /* undo icons */
-.dokuwiki a:link, .dokuwiki a:visited {
+.dokuwiki a:link,
+.dokuwiki a:visited {
     text-decoration: underline;
     color: #333;
     background-color: inherit;
@@ -53,24 +78,51 @@ a.mail:after {
 .dokuwiki pre {
     font-family: monospace;
 }
-.dokuwiki dl.code dt, .dokuwiki dl.file dt {
+.dokuwiki dl.code dt,
+.dokuwiki dl.file dt {
     font-weight: bold;
 }
 
 /* images */
-.dokuwiki img             { border-width: 0; vertical-align: middle; }
-.dokuwiki img.medialeft   { margin: .5em 1.5em .5em 0; float: left; }
-.dokuwiki img.mediaright  { margin: .5em 0 .5em 1.5em; float: right; }
-.dokuwiki img.mediacenter { margin: .5em auto; display: block; }
+.dokuwiki img {
+    border-width: 0;
+    vertical-align: middle;
+}
+.dokuwiki img.media {
+    margin: .2em 0;
+}
+.dokuwiki img.medialeft {
+    margin: .2em 1em .2em 0;
+    float: left;
+}
+.dokuwiki img.mediaright {
+    margin: .2em 0 .2em 1em;
+    float: right;
+}
+.dokuwiki img.mediacenter {
+    margin: .2em auto;
+    display: block;
+}
 
 /* align table cells */
-.dokuwiki .leftalign   { text-align: left; }
-.dokuwiki .centeralign { text-align: center; }
-.dokuwiki .rightalign  { text-align: right; }
+.dokuwiki .leftalign {
+    text-align: left;
+}
+.dokuwiki .centeralign {
+    text-align: center;
+}
+.dokuwiki .rightalign {
+    text-align: right;
+}
 
 /* underline */
-.dokuwiki em.u { font-style: normal; text-decoration: underline; }
-.dokuwiki em em.u { font-style: italic; }
+.dokuwiki em.u {
+    font-style: normal;
+    text-decoration: underline;
+}
+.dokuwiki em em.u {
+    font-style: italic;
+}
 
 div.clearer {
     clear: both;
@@ -93,7 +145,8 @@ div.clearer {
     border-spacing: 0;
     border: 1pt solid #ccc;
 }
-.dokuwiki th, .dokuwiki td {
+.dokuwiki th,
+.dokuwiki td {
     padding: 3pt 5pt;
     margin: 0;
     vertical-align: top;
-- 
cgit v1.2.3


From fdf694b216d23b74238db04b0ee0daf4791817d5 Mon Sep 17 00:00:00 2001
From: Anika Henke 
Date: Sun, 11 Mar 2012 19:58:46 +0000
Subject: added mediamanager link to be highlighted when selected

---
 lib/tpl/dokuwiki/css/design.css | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/tpl/dokuwiki/css/design.css b/lib/tpl/dokuwiki/css/design.css
index a741de355..8617c6c48 100644
--- a/lib/tpl/dokuwiki/css/design.css
+++ b/lib/tpl/dokuwiki/css/design.css
@@ -61,6 +61,7 @@
 .mode_profile a.action.profile,
 .mode_recent a.action.recent,
 .mode_index a.action.index,
+.mode_media a.action.media,
 .mode_revisions a.action.revs,
 .mode_backlink a.action.backlink,
 .mode_subscribe a.action.subscribe {
-- 
cgit v1.2.3


From 9e760ee516dd6e50390490f6d5585b854b895808 Mon Sep 17 00:00:00 2001
From: Andreas Gohr 
Date: Tue, 13 Mar 2012 17:32:53 +0100
Subject: added (failing) test for cleanText()

The cleanText function is supposed to convert DOS to Unix lineendings
but it seems that it doesn't always do that correctly as this thread
suggests: http://forum.dokuwiki.org/thread/8141

I added a unit test that currently fails but haven't found the real
cause yet. Further testing (and a fix) is needed.
---
 _test/cases/inc/common_cleanText.test.php | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)
 create mode 100644 _test/cases/inc/common_cleanText.test.php

diff --git a/_test/cases/inc/common_cleanText.test.php b/_test/cases/inc/common_cleanText.test.php
new file mode 100644
index 000000000..571e41fa5
--- /dev/null
+++ b/_test/cases/inc/common_cleanText.test.php
@@ -0,0 +1,31 @@
+assertEqual($unix,cleanText($unix));
+    }
+
+    function test_win(){
+        $unix = 'one
+                two
+
+                three';
+        $win  = 'one
+                two
+                
+                three';
+        $this->assertNotEqual($unix,$win);
+        $this->assertEqual($unix,cleanText($win));
+    }
+}
+
+//Setup VIM: ex: et ts=4 :
-- 
cgit v1.2.3


From 6212730ca98f1a8c054d742fa68f988e77be4caf Mon Sep 17 00:00:00 2001
From: Andreas Gohr 
Date: Tue, 13 Mar 2012 19:08:15 +0100
Subject: the previous test case had an error

There were whitespaces on the empty DOS line. This fixes the test but
does not explain the broken behaviour in the wiki itself.
---
 _test/cases/inc/common_cleanText.test.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/_test/cases/inc/common_cleanText.test.php b/_test/cases/inc/common_cleanText.test.php
index 571e41fa5..936ed1d76 100644
--- a/_test/cases/inc/common_cleanText.test.php
+++ b/_test/cases/inc/common_cleanText.test.php
@@ -19,10 +19,13 @@ class common_clientIP_test extends UnitTestCase {
                 two
 
                 three';
-        $win  = 'one
+        $win = 'one
                 two
-                
+
                 three';
+
+        $this->assertEqual(bin2hex($unix),'6f6e650a2020202020202020202020202020202074776f0a0a202020202020202020202020202020207468726565');
+        $this->assertEqual(bin2hex($win),'6f6e650d0a2020202020202020202020202020202074776f0d0a0d0a202020202020202020202020202020207468726565');
         $this->assertNotEqual($unix,$win);
         $this->assertEqual($unix,cleanText($win));
     }
-- 
cgit v1.2.3


From 7651b376ab78457d123e1c3513a6a4b8b0d5a7e7 Mon Sep 17 00:00:00 2001
From: Andreas Gohr 
Date: Tue, 13 Mar 2012 19:21:17 +0100
Subject: pass the correct clean parameter when reading wiki pages

DokuWiki's page loading is intended to be filesystem agnostic. DOS line
endings in pages are supposed to be self healing. This behaviour was
broken in a change in 2006. As long as you edited pages through DokuWiki
only you never noticed the bug though.
---
 inc/io.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/inc/io.php b/inc/io.php
index 034ac650e..c76d2f44c 100644
--- a/inc/io.php
+++ b/inc/io.php
@@ -63,7 +63,7 @@ function io_sweepNS($id,$basedir='datadir'){
  */
 function io_readWikiPage($file, $id, $rev=false) {
     if (empty($rev)) { $rev = false; }
-    $data = array(array($file, false), getNS($id), noNS($id), $rev);
+    $data = array(array($file, true), getNS($id), noNS($id), $rev);
     return trigger_event('IO_WIKIPAGE_READ', $data, '_io_readWikiPage_action', false);
 }
 
-- 
cgit v1.2.3


From a23ac4d7df6b3952d2d1b76686d3b439fc0a6759 Mon Sep 17 00:00:00 2001
From: Michael Hamann 
Date: Thu, 15 Mar 2012 14:21:42 +0100
Subject: Indexer: Check for deleted pages first FS#2469

This move the check if the page doesn't exist anymore but is still in
the index before the check if the index needs to be updated as otherwise
deleted pages won't be deleted from the index.
---
 inc/indexer.php | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/inc/indexer.php b/inc/indexer.php
index 9d8d6f99b..3f56e5fe5 100644
--- a/inc/indexer.php
+++ b/inc/indexer.php
@@ -1174,18 +1174,8 @@ function & idx_get_stopwords() {
  * @author Tom N Harris 
  */
 function idx_addPage($page, $verbose=false, $force=false) {
-    // check if indexing needed
     $idxtag = metaFN($page,'.indexed');
-    if(!$force && @file_exists($idxtag)){
-        if(trim(io_readFile($idxtag)) == idx_get_version()){
-            $last = @filemtime($idxtag);
-            if($last > @filemtime(wikiFN($page))){
-                if ($verbose) print("Indexer: index for $page up to date".DOKU_LF);
-                return false;
-            }
-        }
-    }
-
+    // check if page was deleted but is still in the index
     if (!page_exists($page)) {
         if (!@file_exists($idxtag)) {
             if ($verbose) print("Indexer: $page does not exist, ignoring".DOKU_LF);
@@ -1200,6 +1190,18 @@ function idx_addPage($page, $verbose=false, $force=false) {
         @unlink($idxtag);
         return $result;
     }
+
+    // check if indexing needed
+    if(!$force && @file_exists($idxtag)){
+        if(trim(io_readFile($idxtag)) == idx_get_version()){
+            $last = @filemtime($idxtag);
+            if($last > @filemtime(wikiFN($page))){
+                if ($verbose) print("Indexer: index for $page up to date".DOKU_LF);
+                return false;
+            }
+        }
+    }
+
     $indexenabled = p_get_metadata($page, 'internal index', METADATA_RENDER_UNLIMITED);
     if ($indexenabled === false) {
         $result = false;
-- 
cgit v1.2.3


From 8d1fa7573a9c92901a1fef0e77f6543f0b3fcf62 Mon Sep 17 00:00:00 2001
From: Michael Hamann 
Date: Thu, 15 Mar 2012 14:55:32 +0100
Subject: Display the indexer web bug for deleted pages

This executes the indexer for deleted pages. This is necessary for the
search index to be able to deleted deleted pages from the search index.
---
 inc/template.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/inc/template.php b/inc/template.php
index d9a2042ad..5733972f7 100644
--- a/inc/template.php
+++ b/inc/template.php
@@ -1012,8 +1012,6 @@ function _tpl_img_action($data, $param=NULL) {
  */
 function tpl_indexerWebBug(){
     global $ID;
-    global $INFO;
-    if(!$INFO['exists']) return false;
 
     $p = array();
     $p['src']    = DOKU_BASE.'lib/exe/indexer.php?id='.rawurlencode($ID).
-- 
cgit v1.2.3


From c55c59e3d67b1481e86b41e4b49083c99d3659c5 Mon Sep 17 00:00:00 2001
From: Michael Hamann 
Date: Thu, 15 Mar 2012 14:56:48 +0100
Subject: Fix page deletion in the indexer

This fixes page deletion in the indexer and fixes a but where empty
lines were added to the _i.idx file of metadata for which no value was
set (harmless, and wasn't executed anyway).
---
 inc/indexer.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/inc/indexer.php b/inc/indexer.php
index 3f56e5fe5..6766bec25 100644
--- a/inc/indexer.php
+++ b/inc/indexer.php
@@ -351,7 +351,7 @@ class Doku_Indexer {
             return "locked";
 
         // load known documents
-        $pid = $this->getIndexKey('page', '', $page);
+        $pid = $this->addIndexKey('page', '', $page);
         if ($pid === false) {
             $this->unlock();
             return false;
@@ -389,6 +389,7 @@ class Doku_Indexer {
             $val_idx = explode(':', $this->getIndexKey($metaname.'_p', '', $pid));
             $meta_idx = $this->getIndex($metaname.'_i', '');
             foreach ($val_idx as $id) {
+                if ($id === '') continue;
                 $meta_idx[$id] = $this->updateTuple($meta_idx[$id], $pid, 0);
             }
             $this->saveIndex($metaname.'_i', '', $meta_idx);
-- 
cgit v1.2.3


From 2d3a59d6c04d76f92f637e1278d5044795f80330 Mon Sep 17 00:00:00 2001
From: Andreas Gohr 
Date: Thu, 15 Mar 2012 23:56:16 +0100
Subject: Updated CodeSniffer files for work with Version 1.3.3

---
 _cs/DokuWiki/DokuWikiCodingStandard.php            | 78 ----------------------
 .../Sniffs/PHP/DiscouragedFunctionsSniff.php       |  4 +-
 _cs/DokuWiki/ruleset.xml                           | 49 ++++++++++++++
 3 files changed, 50 insertions(+), 81 deletions(-)
 delete mode 100644 _cs/DokuWiki/DokuWikiCodingStandard.php
 create mode 100644 _cs/DokuWiki/ruleset.xml

diff --git a/_cs/DokuWiki/DokuWikiCodingStandard.php b/_cs/DokuWiki/DokuWikiCodingStandard.php
deleted file mode 100644
index 36133fc46..000000000
--- a/_cs/DokuWiki/DokuWikiCodingStandard.php
+++ /dev/null
@@ -1,78 +0,0 @@
-
- */
-
-if (class_exists('PHP_CodeSniffer_Standards_CodingStandard', true) === false) {
-    throw new PHP_CodeSniffer_Exception('Class PHP_CodeSniffer_Standards_CodingStandard not found');
-}
-
-/**
- * DokuWiki Coding Standard.
- *
- * @category  PHP
- * @package   PHP_CodeSniffer
- * @author    Andreas Gohr 
- */
-class PHP_CodeSniffer_Standards_DokuWiki_DokuWikiCodingStandard extends PHP_CodeSniffer_Standards_CodingStandard {
-
-
-    /**
-     * Return a list of external sniffs to include with this standard.
-     *
-     * @return array
-     */
-    public function getIncludedSniffs() {
-        return array(
-            'Generic/Sniffs/Classes/DuplicateClassNameSniff.php',
-            'Generic/Sniffs/CodeAnalysis/JumbledIncrementerSniff.php',
-            'Generic/Sniffs/CodeAnalysis/UnnecessaryFinalModifierSniff.php',
-            'Generic/Sniffs/CodeAnalysis/UnconditionalIfStatementSniff.php',
-            'Generic/Sniffs/CodeAnalysis/ForLoopShouldBeWhileLoopSniff.php',
-            'Generic/Sniffs/CodeAnalysis/ForLoopWithTestFunctionCallSniff.php',
-            'Generic/Sniffs/CodeAnalysis/UnusedFunctionParameterSniff.php',
-            'Generic/Sniffs/CodeAnalysis/EmptyStatementSniff.php',
-            'Generic/Sniffs/CodeAnalysis/UselessOverridingMethodSniff.php',
-            'Generic/Sniffs/Commenting/TodoSniff.php',
-            'Generic/Sniffs/Files/LineEndingsSniff.php',
-            'Generic/Sniffs/Formatting/DisallowMultipleStatementsSniff.php',
-            'Generic/Sniffs/Metrics/NestingLevelSniff.php',
-//            'Generic/Sniffs/Metrics/CyclomaticComplexitySniff.php', //FIXME we might need to tune this first
-            'Generic/Sniffs/NamingConventions/UpperCaseConstantNameSniff.php',
-            'Generic/Sniffs/PHP/LowerCaseConstantSniff.php',
-            'Generic/Sniffs/PHP/DisallowShortOpenTagSniff.php',
-            'Generic/Sniffs/PHP/ForbiddenFunctionsSniff.php',
-            'Generic/Sniffs/WhiteSpace/DisallowTabIndentSniff.php',
-            'DokuWiki/Sniffs/WhiteSpace/ScopeIndentSniff.php',
-            'Zend/Sniffs/Files/ClosingTagSniff.php',
-            'PEAR/Sniffs/Functions/ValidDefaultValueSniff.php',
-            'Squiz/Sniffs/PHP/EvalSniff.php',
-            'Squiz/Sniffs/PHP/NonExecutableCodeSniff.php',
-//            'Squiz/Sniffs/PHP/CommentedOutCodeSniff.php', //FIXME should ignore oneliners
-            'Squiz/Sniffs/WhiteSpace/SuperfluousWhitespaceSniff.php',
-            'Squiz/Sniffs/PHP/NonExecutableCodeSniff.php',
-            'Squiz/Sniffs/CSS/LowercaseStyleDefinitionSniff.php',
-            'Squiz/Sniffs/CSS/MissingColonSniff.php',
-            'Squiz/Sniffs/CSS/DisallowMultipleStyleDefinitionsSniff.php',
-            'Squiz/Sniffs/CSS/ColonSpacingSniff.php',
-            'Squiz/Sniffs/CSS/ClassDefinitionClosingBraceSpaceSniff.php',
-            'Squiz/Sniffs/CSS/SemicolonSpacingSniff.php',
-            'Squiz/Sniffs/CSS/IndentationSniff.php',
-            'Squiz/Sniffs/CSS/EmptyClassDefinitionSniff.php',
-            'Squiz/Sniffs/CSS/ClassDefinitionNameSpacingSniff.php',
-            'Squiz/Sniffs/CSS/EmptyStyleDefinitionSniff.php',
-            'Squiz/Sniffs/CSS/OpacitySniff.php',
-            'Squiz/Sniffs/CSS/ColourDefinitionSniff.php',
-            'Squiz/Sniffs/CSS/DuplicateClassDefinitionSniff.php',
-            'Squiz/Sniffs/CSS/ClassDefinitionOpeningBraceSpaceSniff.php',
-
-            'Squiz/Sniffs/Commenting/DocCommentAlignmentSniff.php',
-
-        );
-    }
-
-}//end class
diff --git a/_cs/DokuWiki/Sniffs/PHP/DiscouragedFunctionsSniff.php b/_cs/DokuWiki/Sniffs/PHP/DiscouragedFunctionsSniff.php
index c95e0fd33..9cd9a7d36 100644
--- a/_cs/DokuWiki/Sniffs/PHP/DiscouragedFunctionsSniff.php
+++ b/_cs/DokuWiki/Sniffs/PHP/DiscouragedFunctionsSniff.php
@@ -49,8 +49,6 @@ class DokuWiki_Sniffs_PHP_DiscouragedFunctionsSniff extends Generic_Sniffs_PHP_F
      *
      * @var bool
      */
-    protected $error = false;
+    public $error = false;
 
 }//end class
-
-?>
diff --git a/_cs/DokuWiki/ruleset.xml b/_cs/DokuWiki/ruleset.xml
new file mode 100644
index 000000000..5efa6bf06
--- /dev/null
+++ b/_cs/DokuWiki/ruleset.xml
@@ -0,0 +1,49 @@
+
+
+    DokuWiki Coding Standard
+
+            ,
+            ,
+            ,
+            ,
+            ,
+            ,
+            ,
+            ,
+            ,
+            ,
+            ,
+            ,
+            ,
+
+            ,
+            ,
+            ,
+            ,
+            ,
+            ,
+            ,
+            ,
+            ,
+            ,
+
+            ,
+            ,
+            ,
+            ,
+            ,
+            ,
+            ,
+            ,
+            ,
+            ,
+            ,
+            ,
+            ,
+            ,
+            ,
+            ,
+
+            ,
+
+
-- 
cgit v1.2.3


From c1272e0334c0f9a6b7bdf86c7489e82aaeb01aa5 Mon Sep 17 00:00:00 2001
From: Andreas Gohr 
Date: Fri, 16 Mar 2012 00:38:36 +0100
Subject: some code sniffer rule adjustments

---
 _cs/DokuWiki/ruleset.xml | 88 +++++++++++++++++++++++++-----------------------
 1 file changed, 46 insertions(+), 42 deletions(-)

diff --git a/_cs/DokuWiki/ruleset.xml b/_cs/DokuWiki/ruleset.xml
index 5efa6bf06..4135c0860 100644
--- a/_cs/DokuWiki/ruleset.xml
+++ b/_cs/DokuWiki/ruleset.xml
@@ -2,48 +2,52 @@
 
     DokuWiki Coding Standard
 
-            ,
-            ,
-            ,
-            ,
-            ,
-            ,
-            ,
-            ,
-            ,
-            ,
-            ,
-            ,
-            ,
-
-            ,
-            ,
-            ,
-            ,
-            ,
-            ,
-            ,
-            ,
-            ,
-            ,
-
-            ,
-            ,
-            ,
-            ,
-            ,
-            ,
-            ,
-            ,
-            ,
-            ,
-            ,
-            ,
-            ,
-            ,
-            ,
-            ,
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
 
-            ,
+        
 
 
-- 
cgit v1.2.3


From 37b032b419e51fe8cae1e63dd067601cc111040f Mon Sep 17 00:00:00 2001
From: Andreas Gohr 
Date: Fri, 16 Mar 2012 10:19:16 +0100
Subject: find deprecated functions in codesniffer

---
 .../Sniffs/PHP/DeprecatedFunctionsSniff.php        | 61 ++++++++++++++++++++++
 1 file changed, 61 insertions(+)
 create mode 100644 _cs/DokuWiki/Sniffs/PHP/DeprecatedFunctionsSniff.php

diff --git a/_cs/DokuWiki/Sniffs/PHP/DeprecatedFunctionsSniff.php b/_cs/DokuWiki/Sniffs/PHP/DeprecatedFunctionsSniff.php
new file mode 100644
index 000000000..ecd4093b8
--- /dev/null
+++ b/_cs/DokuWiki/Sniffs/PHP/DeprecatedFunctionsSniff.php
@@ -0,0 +1,61 @@
+
+ * @copyright 2006 Squiz Pty Ltd (ABN 77 084 670 600)
+ * @license   http://matrix.squiz.net/developer/tools/php_cs/licence BSD Licence
+ * @version   CVS: $Id: DiscouragedFunctionsSniff.php 265110 2008-08-19 06:36:11Z squiz $
+ * @link      http://pear.php.net/package/PHP_CodeSniffer
+ */
+
+if (class_exists('Generic_Sniffs_PHP_ForbiddenFunctionsSniff', true) === false) {
+    throw new PHP_CodeSniffer_Exception('Class Generic_Sniffs_PHP_ForbiddenFunctionsSniff not found');
+}
+
+/**
+ * DokuWiki_Sniffs_PHP_DiscouragedFunctionsSniff.
+ *
+ * @category  PHP
+ * @package   PHP_CodeSniffer
+ * @author    Greg Sherwood 
+ * @copyright 2006 Squiz Pty Ltd (ABN 77 084 670 600)
+ * @license   http://matrix.squiz.net/developer/tools/php_cs/licence BSD Licence
+ * @version   Release: 1.2.2
+ * @link      http://pear.php.net/package/PHP_CodeSniffer
+ */
+class DokuWiki_Sniffs_PHP_DeprecatedFunctionsSniff extends Generic_Sniffs_PHP_ForbiddenFunctionsSniff
+{
+
+    /**
+     * A list of forbidden functions with their alternatives.
+     *
+     * The value is NULL if no alternative exists. IE, the
+     * function should just not be used.
+     *
+     * @var array(string => string|null)
+     */
+    protected $forbiddenFunctions = array(
+        'setCorrectLocale'     => null,
+        'html_attbuild'        => 'buildAttributes',
+        'io_runcmd'            => null,
+        'p_wiki_xhtml_summary' => 'p_cached_output',
+        'search_callback'      => 'call_user_func_array',
+        'search_backlinks'     => 'ft_backlinks',
+        'search_fulltext'      => 'Fulltext Indexer',
+        'search_regex'         => 'Fulltext Indexer',
+        'tpl_getFavicon'       => 'tpl_getMediaFile',
+    );
+
+    /**
+     * If true, an error will be thrown; otherwise a warning.
+     *
+     * @var bool
+     */
+    public $error = true;
+
+}//end class
-- 
cgit v1.2.3


From 7883d066bc903bdea41cfdb920c949ec1ebdf206 Mon Sep 17 00:00:00 2001
From: Andreas Gohr 
Date: Fri, 16 Mar 2012 10:41:12 +0100
Subject: use dformat in toolbar build of the signature string

---
 inc/toolbar.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/inc/toolbar.php b/inc/toolbar.php
index 02172510e..b588d4477 100644
--- a/inc/toolbar.php
+++ b/inc/toolbar.php
@@ -243,7 +243,7 @@ function toolbar_signature(){
     global $INFO;
 
     $sig = $conf['signature'];
-    $sig = strftime($sig);
+    $sig = dformat(null,$sig);
     $sig = str_replace('@USER@',$_SERVER['REMOTE_USER'],$sig);
     $sig = str_replace('@NAME@',$INFO['userinfo']['name'],$sig);
     $sig = str_replace('@MAIL@',$INFO['userinfo']['mail'],$sig);
-- 
cgit v1.2.3


From d4dca43453a7a9e798c208cbb89ee09616381dde Mon Sep 17 00:00:00 2001
From: Andreas Gohr 
Date: Fri, 16 Mar 2012 11:11:15 +0100
Subject: fixed error in bcrypt password method

---
 _test/cases/inc/auth_password.test.php | 4 ++++
 inc/PassHash.class.php                 | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/_test/cases/inc/auth_password.test.php b/_test/cases/inc/auth_password.test.php
index 394f0b2f5..d4a4d2bdb 100644
--- a/_test/cases/inc/auth_password.test.php
+++ b/_test/cases/inc/auth_password.test.php
@@ -54,6 +54,10 @@ class auth_password_test extends UnitTestCase {
         $this->assertTrue(auth_verifyPassword('foobcrypt',$hash));
     }
 
+    function test_verifyPassword_fixedbcrypt(){
+        $this->assertTrue(auth_verifyPassword('foobcrypt','$2a$12$uTWercxbq4sjp2xAzv3we.ZOxk51m5V/Bv5bp2H27oVFJl5neFQoC'));
+    }
+
     function test_verifyPassword_nohash(){
         $this->assertTrue(auth_verifyPassword('foo','$1$$n1rTiFE0nRifwV/43bVon/'));
     }
diff --git a/inc/PassHash.class.php b/inc/PassHash.class.php
index 2558f37c6..0521ee305 100644
--- a/inc/PassHash.class.php
+++ b/inc/PassHash.class.php
@@ -427,7 +427,7 @@ class PassHash {
                     $this->gen_salt(22);
         }
 
-        return crypt($password, $salt);
+        return crypt($clear, $salt);
     }
 
 }
-- 
cgit v1.2.3


From d086370fa9b2f3cfa66d4584ed76314e216df899 Mon Sep 17 00:00:00 2001
From: Andreas Gohr 
Date: Fri, 16 Mar 2012 12:09:13 +0100
Subject: more codesniffer updates

---
 .../NamingConventions/ConstructorNameSniff.php     |  85 +++++++++++++++++
 _cs/DokuWiki/ruleset.xml                           | 103 ++++++++++++---------
 2 files changed, 142 insertions(+), 46 deletions(-)
 create mode 100644 _cs/DokuWiki/Sniffs/NamingConventions/ConstructorNameSniff.php

diff --git a/_cs/DokuWiki/Sniffs/NamingConventions/ConstructorNameSniff.php b/_cs/DokuWiki/Sniffs/NamingConventions/ConstructorNameSniff.php
new file mode 100644
index 000000000..7dd6d9366
--- /dev/null
+++ b/_cs/DokuWiki/Sniffs/NamingConventions/ConstructorNameSniff.php
@@ -0,0 +1,85 @@
+
+ * @author    Leif Wickland 
+ * @copyright 2006-2011 Squiz Pty Ltd (ABN 77 084 670 600)
+ * @license   http://matrix.squiz.net/developer/tools/php_cs/licence BSD Licence
+ * @link      http://pear.php.net/package/PHP_CodeSniffer
+ */
+
+if (class_exists('PHP_CodeSniffer_Standards_AbstractScopeSniff', true) === false) {
+    $error = 'Class PHP_CodeSniffer_Standards_AbstractScopeSniff not found';
+    throw new PHP_CodeSniffer_Exception($error);
+}
+
+/**
+ * Generic_Sniffs_NamingConventions_ConstructorNameSniff.
+ *
+ * Favor PHP 5 constructor syntax, which uses "function __construct()".
+ * Avoid PHP 4 constructor syntax, which uses "function ClassName()".
+ *
+ * @category PHP
+ * @package  PHP_CodeSniffer
+ * @author   Leif Wickland 
+ * @license  http://matrix.squiz.net/developer/tools/php_cs/licence BSD Licence
+ * @version  Release: 1.3.3
+ * @link     http://pear.php.net/package/PHP_CodeSniffer
+ */
+class DokuWiki_Sniffs_NamingConventions_ConstructorNameSniff extends Generic_Sniffs_NamingConventions_ConstructorNameSniff
+{
+    /**
+     * Processes this test when one of its tokens is encountered.
+     *
+     * @param PHP_CodeSniffer_File $phpcsFile The current file being scanned.
+     * @param int                  $stackPtr  The position of the current token
+     *                                        in the stack passed in $tokens.
+     * @param int                  $currScope A pointer to the start of the scope.
+     *
+     * @return void
+     */
+    protected function processTokenWithinScope(
+        PHP_CodeSniffer_File $phpcsFile,
+        $stackPtr,
+        $currScope
+    ) {
+        $className  = $phpcsFile->getDeclarationName($currScope);
+        $methodName = $phpcsFile->getDeclarationName($stackPtr);
+
+        if (strcasecmp($methodName, $className) === 0) {
+            $error = 'PHP4 style constructors are discouraged; use "__construct()" instead';
+            $phpcsFile->addWarning($error, $stackPtr, 'OldStyle');
+        } else if (strcasecmp($methodName, '__construct') !== 0) {
+            // Not a constructor.
+            return;
+        }
+
+        $tokens = $phpcsFile->getTokens();
+
+        $parentClassName = $phpcsFile->findExtendedClassName($currScope);
+        if ($parentClassName === false) {
+            return;
+        }
+
+        $endFunctionIndex = $tokens[$stackPtr]['scope_closer'];
+        $startIndex       = $stackPtr;
+        while ($doubleColonIndex = $phpcsFile->findNext(array(T_DOUBLE_COLON), $startIndex, $endFunctionIndex)) {
+            if ($tokens[($doubleColonIndex + 1)]['code'] === T_STRING
+                && $tokens[($doubleColonIndex + 1)]['content'] === $parentClassName
+            ) {
+                $error = 'PHP4 style calls to parent constructors are discouraged; use "parent::__construct()" instead';
+                $phpcsFile->addWarning($error, ($doubleColonIndex + 1), 'OldStyleCall');
+            }
+
+            $startIndex = ($doubleColonIndex + 1);
+        }
+
+    }//end processTokenWithinScope()
+
+
+}//end class
diff --git a/_cs/DokuWiki/ruleset.xml b/_cs/DokuWiki/ruleset.xml
index 4135c0860..bfbef87fe 100644
--- a/_cs/DokuWiki/ruleset.xml
+++ b/_cs/DokuWiki/ruleset.xml
@@ -2,52 +2,63 @@
 
     DokuWiki Coding Standard
 
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
+    
+    */adLDAP.php
+    */EmailAddressValidator.php
+    */feedcreator.class.php
+    */SimplePie.php
+    */geshi.php
+    */geshi/*
+    */JSON.php
 
-        
+    
+    */_test/*
+    */_cs/*
+
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+        
+            
+        
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
 
 
-- 
cgit v1.2.3


From 63703ba5bd81f50c43bc45f8bf79c514afa3ee49 Mon Sep 17 00:00:00 2001
From: Andreas Gohr 
Date: Fri, 16 Mar 2012 12:09:30 +0100
Subject: coding style updates

---
 inc/DifferenceEngine.php       |  10 +-
 inc/HTTPClient.php             |   4 +-
 inc/PassHash.class.php         |   4 +-
 inc/SafeFN.class.php           |  23 +-
 inc/Sitemapper.php             |  26 +-
 inc/TarLib.class.php           |   4 +-
 inc/auth.php                   |   7 +-
 inc/auth/ad.class.php          |  40 +-
 inc/auth/basic.class.php       | 728 ++++++++++++++++----------------
 inc/auth/ldap.class.php        |   5 +-
 inc/auth/mysql.class.php       | 932 +++++++++++++++++++++--------------------
 inc/auth/pgsql.class.php       | 417 +++++++++---------
 inc/auth/plain.class.php       | 282 ++++++-------
 inc/cliopts.php                |  10 +-
 inc/common.php                 |  18 +-
 inc/config_cascade.php         |   2 +-
 inc/html.php                   |   5 -
 inc/indexer.php                |   1 -
 inc/mail.php                   |   6 +-
 inc/media.php                  |   8 +-
 inc/pageutils.php              |   8 +-
 inc/plugincontroller.class.php |   1 +
 inc/template.php               |   2 +-
 inc/utf8.php                   |   2 +-
 24 files changed, 1277 insertions(+), 1268 deletions(-)

diff --git a/inc/DifferenceEngine.php b/inc/DifferenceEngine.php
index 6e1d07382..01926b20c 100644
--- a/inc/DifferenceEngine.php
+++ b/inc/DifferenceEngine.php
@@ -29,7 +29,7 @@ class _DiffOp {
 
 class _DiffOp_Copy extends _DiffOp {
     var $type = 'copy';
-    
+
     function __construct($orig, $closing = false) {
         if (!is_array($closing))
             $closing = $orig;
@@ -44,7 +44,7 @@ class _DiffOp_Copy extends _DiffOp {
 
 class _DiffOp_Delete extends _DiffOp {
     var $type = 'delete';
-    
+
     function __construct($lines) {
         $this->orig = $lines;
         $this->closing = false;
@@ -57,7 +57,7 @@ class _DiffOp_Delete extends _DiffOp {
 
 class _DiffOp_Add extends _DiffOp {
     var $type = 'add';
-    
+
     function __construct($lines) {
         $this->closing = $lines;
         $this->orig = false;
@@ -70,7 +70,7 @@ class _DiffOp_Add extends _DiffOp {
 
 class _DiffOp_Change extends _DiffOp {
     var $type = 'change';
-    
+
     function __construct($orig, $closing) {
         $this->orig = $orig;
         $this->closing = $closing;
@@ -924,7 +924,7 @@ class WordLevelDiff extends MappedDiff {
 }
 
 class InlineWordLevelDiff extends MappedDiff {
-    
+
     function __construct($orig_lines, $closing_lines) {
         list ($orig_words, $orig_stripped) = $this->_split($orig_lines);
         list ($closing_words, $closing_stripped) = $this->_split($closing_lines);
diff --git a/inc/HTTPClient.php b/inc/HTTPClient.php
index f0470e736..62c3fde2f 100644
--- a/inc/HTTPClient.php
+++ b/inc/HTTPClient.php
@@ -22,7 +22,7 @@ class DokuHTTPClient extends HTTPClient {
      *
      * @author Andreas Gohr 
      */
-    function DokuHTTPClient(){
+    function __construct(){
         global $conf;
 
         // call parent constructor
@@ -121,7 +121,7 @@ class HTTPClient {
      *
      * @author Andreas Gohr 
      */
-    function HTTPClient(){
+    function __construct(){
         $this->agent        = 'Mozilla/4.0 (compatible; DokuWiki HTTP Client; '.PHP_OS.')';
         $this->timeout      = 15;
         $this->cookies      = array();
diff --git a/inc/PassHash.class.php b/inc/PassHash.class.php
index 0521ee305..3fb1349d2 100644
--- a/inc/PassHash.class.php
+++ b/inc/PassHash.class.php
@@ -88,7 +88,9 @@ class PassHash {
     public function gen_salt($len=32){
         $salt  = '';
         $chars = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789';
-        for($i=0;$i<$len;$i++) $salt .= $chars[mt_rand(0,61)];
+        for($i=0; $i<$len; $i++){
+            $salt .= $chars[mt_rand(0,61)];
+        }
         return $salt;
     }
 
diff --git a/inc/SafeFN.class.php b/inc/SafeFN.class.php
index 43b19e9ab..ab05b9eae 100644
--- a/inc/SafeFN.class.php
+++ b/inc/SafeFN.class.php
@@ -1,17 +1,17 @@
 
+ * @date     2010-04-02
  */
 class SafeFN {
 
@@ -133,14 +133,15 @@ class SafeFN {
 
         $converted = false;
         foreach ($split as $sub) {
+            $len = strlen($sub);
             if ($sub[0] != self::$pre_indicator) {
                 // plain (unconverted) characters, optionally starting with a post_indicator
                 // set initial value to skip any post_indicator
-                for ($i=($converted?1:0); $i < strlen($sub); $i++) {
+                for ($i=($converted?1:0); $i < $len; $i++) {
                     $unicode[] = ord($sub[$i]);
                 }
                 $converted = false;
-            } else if (strlen($sub)==1) {
+            } else if ($len==1) {
                 // a pre_indicator character in the real data
                 $unicode[] = ord($sub);
                 $converted = true;
diff --git a/inc/Sitemapper.php b/inc/Sitemapper.php
index 4689b04a6..bbea73b52 100644
--- a/inc/Sitemapper.php
+++ b/inc/Sitemapper.php
@@ -10,7 +10,7 @@ if(!defined('DOKU_INC')) die('meh.');
 
 /**
  * A class for building sitemaps and pinging search engines with the sitemap URL.
- * 
+ *
  * @author Michael Hamann
  */
 class Sitemapper {
@@ -55,7 +55,7 @@ class Sitemapper {
             if(isHiddenPage($id)) continue;
             if(auth_aclcheck($id,'','') < AUTH_READ) continue;
             $item = SitemapItem::createFromID($id);
-            if ($item !== NULL)
+            if ($item !== null)
                 $items[] = $item;
         }
 
@@ -72,7 +72,7 @@ class Sitemapper {
 
     /**
      * Builds the sitemap XML string from the given array auf SitemapItems.
-     * 
+     *
      * @param $items array The SitemapItems that shall be included in the sitemap.
      * @return string The sitemap XML.
      * @author Michael Hamann
@@ -92,7 +92,7 @@ class Sitemapper {
 
     /**
      * Helper function for getting the path to the sitemap file.
-     * 
+     *
      * @return The path to the sitemap file.
      * @author Michael Hamann
      */
@@ -108,9 +108,9 @@ class Sitemapper {
     }
 
     /**
-     * Pings search engines with the sitemap url. Plugins can add or remove 
+     * Pings search engines with the sitemap url. Plugins can add or remove
      * urls to ping using the SITEMAP_PING event.
-     * 
+     *
      * @author Michael Hamann
      */
     public static function pingSearchEngines() {
@@ -145,7 +145,7 @@ class Sitemapper {
 
 /**
  * An item of a sitemap.
- * 
+ *
  * @author Michael Hamann
  */
 class SitemapItem {
@@ -156,7 +156,7 @@ class SitemapItem {
 
     /**
      * Create a new item.
-     * 
+     *
      * @param $url string The url of the item
      * @param $lastmod int Timestamp of the last modification
      * @param $changefreq string How frequently the item is likely to change. Valid values: always, hourly, daily, weekly, monthly, yearly, never.
@@ -171,7 +171,7 @@ class SitemapItem {
 
     /**
      * Helper function for creating an item for a wikipage id.
-     * 
+     *
      * @param $id string A wikipage id.
      * @param $changefreq string How frequently the item is likely to change. Valid values: always, hourly, daily, weekly, monthly, yearly, never.
      * @param $priority float|string The priority of the item relative to other URLs on your site. Valid values     range from 0.0 to 1.0.
@@ -180,22 +180,22 @@ class SitemapItem {
     public static function createFromID($id, $changefreq = null, $priority = null) {
         $id = trim($id);
         $date = @filemtime(wikiFN($id));
-        if(!$date) return NULL;
+        if(!$date) return null;
         return new SitemapItem(wl($id, '', true), $date, $changefreq, $priority);
     }
 
     /**
      * Get the XML representation of the sitemap item.
-     * 
+     *
      * @return The XML representation.
      */
     public function toXML() {
         $result = '  '.NL
                  .'    '.hsc($this->url).''.NL
                  .'    '.date_iso8601($this->lastmod).''.NL;
-        if ($this->changefreq !== NULL)
+        if ($this->changefreq !== null)
             $result .= '    '.hsc($this->changefreq).''.NL;
-        if ($this->priority !== NULL)
+        if ($this->priority !== null)
             $result .= '    '.hsc($this->priority).''.NL;
         $result .= '  '.NL;
         return $result;
diff --git a/inc/TarLib.class.php b/inc/TarLib.class.php
index 12418c48d..36c1fee83 100644
--- a/inc/TarLib.class.php
+++ b/inc/TarLib.class.php
@@ -108,7 +108,7 @@ class TarLib {
      * represent the GZIP or BZIP compression level.  1 produce fast compression,
      * and 9 produce smaller files. See the RFC 1952 for more infos.
      */
-    function tarlib($p_filen = TarLib::ARCHIVE_DYNAMIC , $p_comptype = TarLib::COMPRESS_AUTO, $p_complevel = 9) {
+    function __construct($p_filen = TarLib::ARCHIVE_DYNAMIC , $p_comptype = TarLib::COMPRESS_AUTO, $p_complevel = 9) {
         $this->_initerror = 0;
         $this->_nomf = $p_filen;
         $flag=0;
@@ -127,7 +127,7 @@ class TarLib {
         }
 
         switch($p_comptype) {
-        case TarLib::COMPRESS_GZIP:
+            case TarLib::COMPRESS_GZIP:
                 if(!extension_loaded('zlib')) $this->_initerror = -1;
                 $this->_comptype = TarLib::COMPRESS_GZIP;
                 break;
diff --git a/inc/auth.php b/inc/auth.php
index 78d98a99e..cd0f612aa 100644
--- a/inc/auth.php
+++ b/inc/auth.php
@@ -677,7 +677,7 @@ function auth_sendPassword($user,$password){
 
     if(empty($conf['mailprefix'])) {
         $subject = $lang['regpwmail'];
-    } else {  
+    } else {
         $subject = '['.$conf['mailprefix'].'] '.$lang['regpwmail'];
     }
 
@@ -883,7 +883,6 @@ function act_resendpwd(){
             return false;
         }
 
-
         if(!$conf['autopasswd']){ // we let the user choose a password
             // password given correctly?
             if(!isset($_REQUEST['pass']) || $_REQUEST['pass'] == '') return false;
@@ -950,10 +949,10 @@ function act_resendpwd(){
 
         if(empty($conf['mailprefix'])) {
             $subject = $lang['regpwmail'];
-        } else {  
+        } else {
             $subject = '['.$conf['mailprefix'].'] '.$lang['regpwmail'];
         }
-        
+
         if(mail_send($userinfo['name'].' <'.$userinfo['mail'].'>',
                      $subject,
                      $text,
diff --git a/inc/auth/ad.class.php b/inc/auth/ad.class.php
index cc080dc93..bc4168527 100644
--- a/inc/auth/ad.class.php
+++ b/inc/auth/ad.class.php
@@ -33,10 +33,10 @@
  *   // add a list of comma separated ldap contact fields.
  *   $conf['auth']['ad']['additional'] = 'field1,field2';
  *
- *  @license GPL 2 (http://www.gnu.org/licenses/gpl.html)
- *  @author  James Van Lommel 
- *  @link    http://www.nosq.com/blog/2005/08/ldap-activedirectory-and-dokuwiki/
- *  @author  Andreas Gohr 
+ * @license GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * @author  James Van Lommel 
+ * @link    http://www.nosq.com/blog/2005/08/ldap-activedirectory-and-dokuwiki/
+ * @author  Andreas Gohr 
  */
 
 require_once(DOKU_INC.'inc/adLDAP.php');
@@ -51,11 +51,10 @@ class auth_ad extends auth_basic {
     /**
      * Constructor
      */
-    function auth_ad() {
+    function __construct() {
         global $conf;
         $this->cnf = $conf['auth']['ad'];
 
-
         // additional information fields
         if (isset($this->cnf['additional'])) {
             $this->cnf['additional'] = str_replace(' ', '', $this->cnf['additional']);
@@ -72,21 +71,21 @@ class auth_ad extends auth_basic {
 
         // Prepare SSO
         if($_SERVER['REMOTE_USER'] && $this->cnf['sso']){
-             // remove possible NTLM domain
-             list($dom,$usr) = explode('\\',$_SERVER['REMOTE_USER'],2);
-             if(!$usr) $usr = $dom;
+            // remove possible NTLM domain
+            list($dom,$usr) = explode('\\',$_SERVER['REMOTE_USER'],2);
+            if(!$usr) $usr = $dom;
 
-             // remove possible Kerberos domain
-             list($usr,$dom) = explode('@',$usr);
+            // remove possible Kerberos domain
+            list($usr,$dom) = explode('@',$usr);
 
-             $dom = strtolower($dom);
-             $_SERVER['REMOTE_USER'] = $usr;
+            $dom = strtolower($dom);
+            $_SERVER['REMOTE_USER'] = $usr;
 
-             // we need to simulate a login
-             if(empty($_COOKIE[DOKU_COOKIE])){
-                 $_REQUEST['u'] = $_SERVER['REMOTE_USER'];
-                 $_REQUEST['p'] = 'sso_only';
-             }
+            // we need to simulate a login
+            if(empty($_COOKIE[DOKU_COOKIE])){
+                $_REQUEST['u'] = $_SERVER['REMOTE_USER'];
+                $_REQUEST['p'] = 'sso_only';
+            }
         }
 
         // prepare adLDAP standard configuration
@@ -147,7 +146,7 @@ class auth_ad extends auth_basic {
      *
      * @author  James Van Lommel 
      */
-   function getUserData($user){
+    function getUserData($user){
         global $conf;
         global $lang;
         global $ID;
@@ -297,7 +296,7 @@ class auth_ad extends auth_basic {
      * @param   $user      nick of the user to be changed
      * @param   $changes   array of field/value pairs to be changed
      * @return  bool
-    */
+     */
     function modifyUser($user, $changes) {
         $return = true;
 
@@ -380,7 +379,6 @@ class auth_ad extends auth_basic {
     function _constructPattern($filter) {
         $this->_pattern = array();
         foreach ($filter as $item => $pattern) {
-//          $this->_pattern[$item] = '/'.preg_quote($pattern,"/").'/i';          // don't allow regex characters
             $this->_pattern[$item] = '/'.str_replace('/','\/',$pattern).'/i';    // allow regex characters
         }
     }
diff --git a/inc/auth/basic.class.php b/inc/auth/basic.class.php
index c7e7031bf..7c0a5f2c9 100644
--- a/inc/auth/basic.class.php
+++ b/inc/auth/basic.class.php
@@ -9,395 +9,393 @@
  */
 
 class auth_basic {
+    var $success = true;
 
-  var $success = true;
-
-
-  /**
-   * Posible things an auth backend module may be able to
-   * do. The things a backend can do need to be set to true
-   * in the constructor.
-   */
-  var $cando = array (
-    'addUser'     => false, // can Users be created?
-    'delUser'     => false, // can Users be deleted?
-    'modLogin'    => false, // can login names be changed?
-    'modPass'     => false, // can passwords be changed?
-    'modName'     => false, // can real names be changed?
-    'modMail'     => false, // can emails be changed?
-    'modGroups'   => false, // can groups be changed?
-    'getUsers'    => false, // can a (filtered) list of users be retrieved?
-    'getUserCount'=> false, // can the number of users be retrieved?
-    'getGroups'   => false, // can a list of available groups be retrieved?
-    'external'    => false, // does the module do external auth checking?
-    'logout'      => true,  // can the user logout again? (eg. not possible with HTTP auth)
-  );
+    /**
+     * Posible things an auth backend module may be able to
+     * do. The things a backend can do need to be set to true
+     * in the constructor.
+     */
+    var $cando = array (
+        'addUser'     => false, // can Users be created?
+        'delUser'     => false, // can Users be deleted?
+        'modLogin'    => false, // can login names be changed?
+        'modPass'     => false, // can passwords be changed?
+        'modName'     => false, // can real names be changed?
+        'modMail'     => false, // can emails be changed?
+        'modGroups'   => false, // can groups be changed?
+        'getUsers'    => false, // can a (filtered) list of users be retrieved?
+        'getUserCount'=> false, // can the number of users be retrieved?
+        'getGroups'   => false, // can a list of available groups be retrieved?
+        'external'    => false, // does the module do external auth checking?
+        'logout'      => true,  // can the user logout again? (eg. not possible with HTTP auth)
+    );
 
+    /**
+     * Constructor.
+     *
+     * Carry out sanity checks to ensure the object is
+     * able to operate. Set capabilities in $this->cando
+     * array here
+     *
+     * Set $this->success to false if checks fail
+     *
+     * @author  Christopher Smith 
+     */
+    function __construct() {
+        // the base class constructor does nothing, derived class
+        // constructors do the real work
+    }
 
-  /**
-   * Constructor.
-   *
-   * Carry out sanity checks to ensure the object is
-   * able to operate. Set capabilities in $this->cando
-   * array here
-   *
-   * Set $this->success to false if checks fail
-   *
-   * @author  Christopher Smith 
-   */
-  function auth_basic() {
-     // the base class constructor does nothing, derived class
-    // constructors do the real work
-  }
+    /**
+     * Capability check. [ DO NOT OVERRIDE ]
+     *
+     * Checks the capabilities set in the $this->cando array and
+     * some pseudo capabilities (shortcutting access to multiple
+     * ones)
+     *
+     * ususal capabilities start with lowercase letter
+     * shortcut capabilities start with uppercase letter
+     *
+     * @author  Andreas Gohr 
+     * @return  bool
+     */
+    function canDo($cap) {
+        switch($cap){
+            case 'Profile':
+                // can at least one of the user's properties be changed?
+                return ( $this->cando['modPass']  ||
+                        $this->cando['modName']  ||
+                        $this->cando['modMail'] );
+                break;
+            case 'UserMod':
+                // can at least anything be changed?
+                return ( $this->cando['modPass']   ||
+                        $this->cando['modName']   ||
+                        $this->cando['modMail']   ||
+                        $this->cando['modLogin']  ||
+                        $this->cando['modGroups'] ||
+                        $this->cando['modMail'] );
+                break;
+            default:
+                // print a helping message for developers
+                if(!isset($this->cando[$cap])){
+                    msg("Check for unknown capability '$cap' - Do you use an outdated Plugin?",-1);
+                }
+                return $this->cando[$cap];
+        }
+    }
 
-  /**
-   * Capability check. [ DO NOT OVERRIDE ]
-   *
-   * Checks the capabilities set in the $this->cando array and
-   * some pseudo capabilities (shortcutting access to multiple
-   * ones)
-   *
-   * ususal capabilities start with lowercase letter
-   * shortcut capabilities start with uppercase letter
-   *
-   * @author  Andreas Gohr 
-   * @return  bool
-   */
-  function canDo($cap) {
-    switch($cap){
-      case 'Profile':
-        // can at least one of the user's properties be changed?
-        return ( $this->cando['modPass']  ||
-                 $this->cando['modName']  ||
-                 $this->cando['modMail'] );
-        break;
-      case 'UserMod':
-        // can at least anything be changed?
-        return ( $this->cando['modPass']   ||
-                 $this->cando['modName']   ||
-                 $this->cando['modMail']   ||
-                 $this->cando['modLogin']  ||
-                 $this->cando['modGroups'] ||
-                 $this->cando['modMail'] );
-        break;
-      default:
-        // print a helping message for developers
-        if(!isset($this->cando[$cap])){
-          msg("Check for unknown capability '$cap' - Do you use an outdated Plugin?",-1);
+    /**
+     * Trigger the AUTH_USERDATA_CHANGE event and call the modification function. [ DO NOT OVERRIDE ]
+     *
+     * You should use this function instead of calling createUser, modifyUser or
+     * deleteUsers directly. The event handlers can prevent the modification, for
+     * example for enforcing a user name schema.
+     *
+     * @author Gabriel Birke 
+     * @param string $type Modification type ('create', 'modify', 'delete')
+     * @param array $params Parameters for the createUser, modifyUser or deleteUsers method. The content of this array depends on the modification type
+     * @return mixed Result from the modification function or false if an event handler has canceled the action
+     */
+    function triggerUserMod($type, $params) {
+        $validTypes = array(
+            'create' => 'createUser',
+            'modify' => 'modifyUser',
+            'delete' => 'deleteUsers'
+        );
+        if(empty($validTypes[$type]))
+            return false;
+        $eventdata = array('type' => $type, 'params' => $params, 'modification_result' => null);
+        $evt = new Doku_Event('AUTH_USER_CHANGE', $eventdata);
+        if ($evt->advise_before(true)) {
+            $result = call_user_func_array(array($this, $validTypes[$type]), $params);
+            $evt->data['modification_result'] = $result;
         }
-        return $this->cando[$cap];
+        $evt->advise_after();
+        unset($evt);
+        return $result;
     }
-  }
 
-  /**
-   * Trigger the AUTH_USERDATA_CHANGE event and call the modification function. [ DO NOT OVERRIDE ]
-   *
-   * You should use this function instead of calling createUser, modifyUser or
-   * deleteUsers directly. The event handlers can prevent the modification, for
-   * example for enforcing a user name schema.
-   *
-   * @author Gabriel Birke 
-   * @param string $type Modification type ('create', 'modify', 'delete')
-   * @param array $params Parameters for the createUser, modifyUser or deleteUsers method. The content of this array depends on the modification type
-   * @return mixed Result from the modification function or false if an event handler has canceled the action
-   */
-  function triggerUserMod($type, $params)
-  {
-    $validTypes = array(
-      'create' => 'createUser',
-      'modify' => 'modifyUser',
-      'delete' => 'deleteUsers'
-    );
-    if(empty($validTypes[$type]))
-      return false;
-    $eventdata = array('type' => $type, 'params' => $params, 'modification_result' => null);
-    $evt = new Doku_Event('AUTH_USER_CHANGE', $eventdata);
-    if ($evt->advise_before(true)) {
-      $result = call_user_func_array(array($this, $validTypes[$type]), $params);
-      $evt->data['modification_result'] = $result;
+    /**
+     * Log off the current user [ OPTIONAL ]
+     *
+     * Is run in addition to the ususal logoff method. Should
+     * only be needed when trustExternal is implemented.
+     *
+     * @see     auth_logoff()
+     * @author  Andreas Gohr 
+     */
+    function logOff(){
     }
-    $evt->advise_after();
-    unset($evt);
-    return $result;
-  }
 
-  /**
-   * Log off the current user [ OPTIONAL ]
-   *
-   * Is run in addition to the ususal logoff method. Should
-   * only be needed when trustExternal is implemented.
-   *
-   * @see     auth_logoff()
-   * @author  Andreas Gohr 
-   */
-  function logOff(){
-  }
+    /**
+     * Do all authentication [ OPTIONAL ]
+     *
+     * Set $this->cando['external'] = true when implemented
+     *
+     * If this function is implemented it will be used to
+     * authenticate a user - all other DokuWiki internals
+     * will not be used for authenticating, thus
+     * implementing the checkPass() function is not needed
+     * anymore.
+     *
+     * The function can be used to authenticate against third
+     * party cookies or Apache auth mechanisms and replaces
+     * the auth_login() function
+     *
+     * The function will be called with or without a set
+     * username. If the Username is given it was called
+     * from the login form and the given credentials might
+     * need to be checked. If no username was given it
+     * the function needs to check if the user is logged in
+     * by other means (cookie, environment).
+     *
+     * The function needs to set some globals needed by
+     * DokuWiki like auth_login() does.
+     *
+     * @see auth_login()
+     * @author  Andreas Gohr 
+     *
+     * @param   string  $user    Username
+     * @param   string  $pass    Cleartext Password
+     * @param   bool    $sticky  Cookie should not expire
+     * @return  bool             true on successful auth
+     */
+    function trustExternal($user,$pass,$sticky=false){
+        /* some example:
+
+        global $USERINFO;
+        global $conf;
+        $sticky ? $sticky = true : $sticky = false; //sanity check
+
+        // do the checking here
 
-  /**
-   * Do all authentication [ OPTIONAL ]
-   *
-   * Set $this->cando['external'] = true when implemented
-   *
-   * If this function is implemented it will be used to
-   * authenticate a user - all other DokuWiki internals
-   * will not be used for authenticating, thus
-   * implementing the checkPass() function is not needed
-   * anymore.
-   *
-   * The function can be used to authenticate against third
-   * party cookies or Apache auth mechanisms and replaces
-   * the auth_login() function
-   *
-   * The function will be called with or without a set
-   * username. If the Username is given it was called
-   * from the login form and the given credentials might
-   * need to be checked. If no username was given it
-   * the function needs to check if the user is logged in
-   * by other means (cookie, environment).
-   *
-   * The function needs to set some globals needed by
-   * DokuWiki like auth_login() does.
-   *
-   * @see auth_login()
-   * @author  Andreas Gohr 
-   *
-   * @param   string  $user    Username
-   * @param   string  $pass    Cleartext Password
-   * @param   bool    $sticky  Cookie should not expire
-   * @return  bool             true on successful auth
-   */
-  function trustExternal($user,$pass,$sticky=false){
-#    // some example:
-#
-#    global $USERINFO;
-#    global $conf;
-#    $sticky ? $sticky = true : $sticky = false; //sanity check
-#
-#    // do the checking here
-#
-#    // set the globals if authed
-#    $USERINFO['name'] = 'FIXME';
-#    $USERINFO['mail'] = 'FIXME';
-#    $USERINFO['grps'] = array('FIXME');
-#    $_SERVER['REMOTE_USER'] = $user;
-#    $_SESSION[DOKU_COOKIE]['auth']['user'] = $user;
-#    $_SESSION[DOKU_COOKIE]['auth']['pass'] = $pass;
-#    $_SESSION[DOKU_COOKIE]['auth']['info'] = $USERINFO;
-#    return true;
-  }
+        // set the globals if authed
+        $USERINFO['name'] = 'FIXME';
+        $USERINFO['mail'] = 'FIXME';
+        $USERINFO['grps'] = array('FIXME');
+        $_SERVER['REMOTE_USER'] = $user;
+        $_SESSION[DOKU_COOKIE]['auth']['user'] = $user;
+        $_SESSION[DOKU_COOKIE]['auth']['pass'] = $pass;
+        $_SESSION[DOKU_COOKIE]['auth']['info'] = $USERINFO;
+        return true;
 
-  /**
-   * Check user+password [ MUST BE OVERRIDDEN ]
-   *
-   * Checks if the given user exists and the given
-   * plaintext password is correct
-   *
-   * May be ommited if trustExternal is used.
-   *
-   * @author  Andreas Gohr 
-   * @return  bool
-   */
-  function checkPass($user,$pass){
-    msg("no valid authorisation system in use", -1);
-    return false;
-  }
+        */
+    }
+
+    /**
+     * Check user+password [ MUST BE OVERRIDDEN ]
+     *
+     * Checks if the given user exists and the given
+     * plaintext password is correct
+     *
+     * May be ommited if trustExternal is used.
+     *
+     * @author  Andreas Gohr 
+     * @return  bool
+     */
+    function checkPass($user,$pass){
+        msg("no valid authorisation system in use", -1);
+        return false;
+    }
 
-  /**
-   * Return user info [ MUST BE OVERRIDDEN ]
-   *
-   * Returns info about the given user needs to contain
-   * at least these fields:
-   *
-   * name string  full name of the user
-   * mail string  email addres of the user
-   * grps array   list of groups the user is in
-   *
-   * @author  Andreas Gohr 
-   * @return  array containing user data or false
-   */
-  function getUserData($user) {
-    if(!$this->cando['external']) msg("no valid authorisation system in use", -1);
-    return false;
-  }
+    /**
+     * Return user info [ MUST BE OVERRIDDEN ]
+     *
+     * Returns info about the given user needs to contain
+     * at least these fields:
+     *
+     * name string  full name of the user
+     * mail string  email addres of the user
+     * grps array   list of groups the user is in
+     *
+     * @author  Andreas Gohr 
+     * @return  array containing user data or false
+     */
+    function getUserData($user) {
+        if(!$this->cando['external']) msg("no valid authorisation system in use", -1);
+        return false;
+    }
 
-  /**
-   * Create a new User [implement only where required/possible]
-   *
-   * Returns false if the user already exists, null when an error
-   * occurred and true if everything went well.
-   *
-   * The new user HAS TO be added to the default group by this
-   * function!
-   *
-   * Set addUser capability when implemented
-   *
-   * @author  Andreas Gohr 
-   */
-  function createUser($user,$pass,$name,$mail,$grps=null){
-    msg("authorisation method does not allow creation of new users", -1);
-    return null;
-  }
+    /**
+     * Create a new User [implement only where required/possible]
+     *
+     * Returns false if the user already exists, null when an error
+     * occurred and true if everything went well.
+     *
+     * The new user HAS TO be added to the default group by this
+     * function!
+     *
+     * Set addUser capability when implemented
+     *
+     * @author  Andreas Gohr 
+     */
+    function createUser($user,$pass,$name,$mail,$grps=null){
+        msg("authorisation method does not allow creation of new users", -1);
+        return null;
+    }
 
-  /**
-   * Modify user data [implement only where required/possible]
-   *
-   * Set the mod* capabilities according to the implemented features
-   *
-   * @author  Chris Smith 
-   * @param   $user      nick of the user to be changed
-   * @param   $changes   array of field/value pairs to be changed (password will be clear text)
-   * @return  bool
-   */
-  function modifyUser($user, $changes) {
-    msg("authorisation method does not allow modifying of user data", -1);
-    return false;
-  }
+    /**
+     * Modify user data [implement only where required/possible]
+     *
+     * Set the mod* capabilities according to the implemented features
+     *
+     * @author  Chris Smith 
+     * @param   $user      nick of the user to be changed
+     * @param   $changes   array of field/value pairs to be changed (password will be clear text)
+     * @return  bool
+     */
+    function modifyUser($user, $changes) {
+        msg("authorisation method does not allow modifying of user data", -1);
+        return false;
+    }
 
-  /**
-   * Delete one or more users [implement only where required/possible]
-   *
-   * Set delUser capability when implemented
-   *
-   * @author  Chris Smith 
-   * @param   array  $users
-   * @return  int    number of users deleted
-   */
-  function deleteUsers($users) {
-    msg("authorisation method does not allow deleting of users", -1);
-    return false;
-  }
+    /**
+     * Delete one or more users [implement only where required/possible]
+     *
+     * Set delUser capability when implemented
+     *
+     * @author  Chris Smith 
+     * @param   array  $users
+     * @return  int    number of users deleted
+     */
+    function deleteUsers($users) {
+        msg("authorisation method does not allow deleting of users", -1);
+        return false;
+    }
 
-  /**
-   * Return a count of the number of user which meet $filter criteria
-   * [should be implemented whenever retrieveUsers is implemented]
-   *
-   * Set getUserCount capability when implemented
-   *
-   * @author  Chris Smith 
-   */
-  function getUserCount($filter=array()) {
-    msg("authorisation method does not provide user counts", -1);
-    return 0;
-  }
+    /**
+     * Return a count of the number of user which meet $filter criteria
+     * [should be implemented whenever retrieveUsers is implemented]
+     *
+     * Set getUserCount capability when implemented
+     *
+     * @author  Chris Smith 
+     */
+    function getUserCount($filter=array()) {
+        msg("authorisation method does not provide user counts", -1);
+        return 0;
+    }
 
-  /**
-   * Bulk retrieval of user data [implement only where required/possible]
-   *
-   * Set getUsers capability when implemented
-   *
-   * @author  Chris Smith 
-   * @param   start     index of first user to be returned
-   * @param   limit     max number of users to be returned
-   * @param   filter    array of field/pattern pairs, null for no filter
-   * @return  array of userinfo (refer getUserData for internal userinfo details)
-   */
-  function retrieveUsers($start=0,$limit=-1,$filter=null) {
-    msg("authorisation method does not support mass retrieval of user data", -1);
-    return array();
-  }
+    /**
+     * Bulk retrieval of user data [implement only where required/possible]
+     *
+     * Set getUsers capability when implemented
+     *
+     * @author  Chris Smith 
+     * @param   start     index of first user to be returned
+     * @param   limit     max number of users to be returned
+     * @param   filter    array of field/pattern pairs, null for no filter
+     * @return  array of userinfo (refer getUserData for internal userinfo details)
+     */
+    function retrieveUsers($start=0,$limit=-1,$filter=null) {
+        msg("authorisation method does not support mass retrieval of user data", -1);
+        return array();
+    }
 
-  /**
-   * Define a group [implement only where required/possible]
-   *
-   * Set addGroup capability when implemented
-   *
-   * @author  Chris Smith 
-   * @return  bool
-   */
-  function addGroup($group) {
-    msg("authorisation method does not support independent group creation", -1);
-    return false;
-  }
+    /**
+     * Define a group [implement only where required/possible]
+     *
+     * Set addGroup capability when implemented
+     *
+     * @author  Chris Smith 
+     * @return  bool
+     */
+    function addGroup($group) {
+        msg("authorisation method does not support independent group creation", -1);
+        return false;
+    }
 
-  /**
-   * Retrieve groups [implement only where required/possible]
-   *
-   * Set getGroups capability when implemented
-   *
-   * @author  Chris Smith 
-   * @return  array
-   */
-  function retrieveGroups($start=0,$limit=0) {
-    msg("authorisation method does not support group list retrieval", -1);
-    return array();
-  }
+    /**
+     * Retrieve groups [implement only where required/possible]
+     *
+     * Set getGroups capability when implemented
+     *
+     * @author  Chris Smith 
+     * @return  array
+     */
+    function retrieveGroups($start=0,$limit=0) {
+        msg("authorisation method does not support group list retrieval", -1);
+        return array();
+    }
 
-  /**
-   * Return case sensitivity of the backend [OPTIONAL]
-   *
-   * When your backend is caseinsensitive (eg. you can login with USER and
-   * user) then you need to overwrite this method and return false
-   */
-  function isCaseSensitive(){
-    return true;
-  }
+    /**
+     * Return case sensitivity of the backend [OPTIONAL]
+     *
+     * When your backend is caseinsensitive (eg. you can login with USER and
+     * user) then you need to overwrite this method and return false
+     */
+    function isCaseSensitive(){
+        return true;
+    }
 
-  /**
-   * Sanitize a given username [OPTIONAL]
-   *
-   * This function is applied to any user name that is given to
-   * the backend and should also be applied to any user name within
-   * the backend before returning it somewhere.
-   *
-   * This should be used to enforce username restrictions.
-   *
-   * @author Andreas Gohr 
-   * @param string $user - username
-   * @param string - the cleaned username
-   */
-  function cleanUser($user){
-    return $user;
-  }
+    /**
+     * Sanitize a given username [OPTIONAL]
+     *
+     * This function is applied to any user name that is given to
+     * the backend and should also be applied to any user name within
+     * the backend before returning it somewhere.
+     *
+     * This should be used to enforce username restrictions.
+     *
+     * @author Andreas Gohr 
+     * @param string $user - username
+     * @param string - the cleaned username
+     */
+    function cleanUser($user){
+        return $user;
+    }
 
-  /**
-   * Sanitize a given groupname [OPTIONAL]
-   *
-   * This function is applied to any groupname that is given to
-   * the backend and should also be applied to any groupname within
-   * the backend before returning it somewhere.
-   *
-   * This should be used to enforce groupname restrictions.
-   *
-   * Groupnames are to be passed without a leading '@' here.
-   *
-   * @author Andreas Gohr 
-   * @param string $group - groupname
-   * @param string - the cleaned groupname
-   */
-  function cleanGroup($group){
-    return $group;
-  }
+    /**
+     * Sanitize a given groupname [OPTIONAL]
+     *
+     * This function is applied to any groupname that is given to
+     * the backend and should also be applied to any groupname within
+     * the backend before returning it somewhere.
+     *
+     * This should be used to enforce groupname restrictions.
+     *
+     * Groupnames are to be passed without a leading '@' here.
+     *
+     * @author Andreas Gohr 
+     * @param string $group - groupname
+     * @param string - the cleaned groupname
+     */
+    function cleanGroup($group){
+        return $group;
+    }
 
 
-  /**
-   * Check Session Cache validity [implement only where required/possible]
-   *
-   * DokuWiki caches user info in the user's session for the timespan defined
-   * in $conf['auth_security_timeout'].
-   *
-   * This makes sure slow authentication backends do not slow down DokuWiki.
-   * This also means that changes to the user database will not be reflected
-   * on currently logged in users.
-   *
-   * To accommodate for this, the user manager plugin will touch a reference
-   * file whenever a change is submitted. This function compares the filetime
-   * of this reference file with the time stored in the session.
-   *
-   * This reference file mechanism does not reflect changes done directly in
-   * the backend's database through other means than the user manager plugin.
-   *
-   * Fast backends might want to return always false, to force rechecks on
-   * each page load. Others might want to use their own checking here. If
-   * unsure, do not override.
-   *
-   * @param  string $user - The username
-   * @author Andreas Gohr 
-   * @return bool
-   */
-  function useSessionCache($user){
-    global $conf;
-    return ($_SESSION[DOKU_COOKIE]['auth']['time'] >= @filemtime($conf['cachedir'].'/sessionpurge'));
-  }
+    /**
+     * Check Session Cache validity [implement only where required/possible]
+     *
+     * DokuWiki caches user info in the user's session for the timespan defined
+     * in $conf['auth_security_timeout'].
+     *
+     * This makes sure slow authentication backends do not slow down DokuWiki.
+     * This also means that changes to the user database will not be reflected
+     * on currently logged in users.
+     *
+     * To accommodate for this, the user manager plugin will touch a reference
+     * file whenever a change is submitted. This function compares the filetime
+     * of this reference file with the time stored in the session.
+     *
+     * This reference file mechanism does not reflect changes done directly in
+     * the backend's database through other means than the user manager plugin.
+     *
+     * Fast backends might want to return always false, to force rechecks on
+     * each page load. Others might want to use their own checking here. If
+     * unsure, do not override.
+     *
+     * @param  string $user - The username
+     * @author Andreas Gohr 
+     * @return bool
+     */
+    function useSessionCache($user){
+        global $conf;
+        return ($_SESSION[DOKU_COOKIE]['auth']['time'] >= @filemtime($conf['cachedir'].'/sessionpurge'));
+    }
 
 }
 //Setup VIM: ex: et ts=2 :
diff --git a/inc/auth/ldap.class.php b/inc/auth/ldap.class.php
index 8eb411995..a6a15ee3d 100644
--- a/inc/auth/ldap.class.php
+++ b/inc/auth/ldap.class.php
@@ -15,7 +15,7 @@ class auth_ldap extends auth_basic {
     /**
      * Constructor
      */
-    function auth_ldap(){
+    function __construct(){
         global $conf;
         $this->cnf = $conf['auth']['ldap'];
 
@@ -307,8 +307,6 @@ class auth_ldap extends auth_basic {
             }
         }
         return $result;
-
-
     }
 
     /**
@@ -360,7 +358,6 @@ class auth_ldap extends auth_basic {
     function _constructPattern($filter) {
         $this->_pattern = array();
         foreach ($filter as $item => $pattern) {
-//          $this->_pattern[$item] = '/'.preg_quote($pattern,"/").'/i';          // don't allow regex characters
             $this->_pattern[$item] = '/'.str_replace('/','\/',$pattern).'/i';    // allow regex characters
         }
     }
diff --git a/inc/auth/mysql.class.php b/inc/auth/mysql.class.php
index 653c725a3..9dcf82a87 100644
--- a/inc/auth/mysql.class.php
+++ b/inc/auth/mysql.class.php
@@ -6,7 +6,7 @@
  * @author     Andreas Gohr 
  * @author     Chris Smith 
  * @author     Matthias Grimm 
-*/
+ */
 
 class auth_mysql extends auth_basic {
 
@@ -25,65 +25,74 @@ class auth_mysql extends auth_basic {
      *
      * @author Matthias Grimm 
      */
-    function auth_mysql() {
-      global $conf;
-      $this->cnf          = $conf['auth']['mysql'];
-
-      if (method_exists($this, 'auth_basic'))
-        parent::auth_basic();
-
-      if(!function_exists('mysql_connect')) {
-        if ($this->cnf['debug'])
-          msg("MySQL err: PHP MySQL extension not found.",-1,__LINE__,__FILE__);
-        $this->success = false;
-        return;
-      }
-
-      // default to UTF-8, you rarely want something else
-      if(!isset($this->cnf['charset'])) $this->cnf['charset'] = 'utf8';
-
-      $this->defaultgroup = $conf['defaultgroup'];
-
-      // set capabilities based upon config strings set
-      if (empty($this->cnf['server']) || empty($this->cnf['user']) ||
-          !isset($this->cnf['password']) || empty($this->cnf['database'])){
-        if ($this->cnf['debug'])
-          msg("MySQL err: insufficient configuration.",-1,__LINE__,__FILE__);
-        $this->success = false;
-        return;
-      }
-
-      $this->cando['addUser']      = $this->_chkcnf(array('getUserInfo',
-                                                          'getGroups',
-                                                          'addUser',
-                                                          'getUserID',
-                                                          'getGroupID',
-                                                          'addGroup',
-                                                          'addUserGroup'),true);
-      $this->cando['delUser']      = $this->_chkcnf(array('getUserID',
-                                                          'delUser',
-                                                          'delUserRefs'),true);
-      $this->cando['modLogin']     = $this->_chkcnf(array('getUserID',
-                                                          'updateUser',
-                                                          'UpdateTarget'),true);
-      $this->cando['modPass']      = $this->cando['modLogin'];
-      $this->cando['modName']      = $this->cando['modLogin'];
-      $this->cando['modMail']      = $this->cando['modLogin'];
-      $this->cando['modGroups']    = $this->_chkcnf(array('getUserID',
-                                                          'getGroups',
-                                                          'getGroupID',
-                                                          'addGroup',
-                                                          'addUserGroup',
-                                                          'delGroup',
-                                                          'getGroupID',
-                                                          'delUserGroup'),true);
-      /* getGroups is not yet supported
-      $this->cando['getGroups']    = $this->_chkcnf(array('getGroups',
-                                                          'getGroupID'),false); */
-      $this->cando['getUsers']     = $this->_chkcnf(array('getUsers',
-                                                          'getUserInfo',
-                                                          'getGroups'),false);
-      $this->cando['getUserCount'] = $this->_chkcnf(array('getUsers'),false);
+    function __construct() {
+        global $conf;
+        $this->cnf = $conf['auth']['mysql'];
+
+        if (method_exists($this, 'auth_basic')){
+            parent::__construct();
+        }
+
+        if(!function_exists('mysql_connect')) {
+            if ($this->cnf['debug']){
+                msg("MySQL err: PHP MySQL extension not found.",-1,__LINE__,__FILE__);
+            }
+            $this->success = false;
+            return;
+        }
+
+        // default to UTF-8, you rarely want something else
+        if(!isset($this->cnf['charset'])) $this->cnf['charset'] = 'utf8';
+
+        $this->defaultgroup = $conf['defaultgroup'];
+
+        // set capabilities based upon config strings set
+        if (empty($this->cnf['server']) || empty($this->cnf['user']) ||
+            !isset($this->cnf['password']) || empty($this->cnf['database'])){
+
+            if ($this->cnf['debug']){
+                msg("MySQL err: insufficient configuration.",-1,__LINE__,__FILE__);
+            }
+            $this->success = false;
+            return;
+        }
+
+        $this->cando['addUser']      = $this->_chkcnf(array(
+                                            'getUserInfo',
+                                            'getGroups',
+                                            'addUser',
+                                            'getUserID',
+                                            'getGroupID',
+                                            'addGroup',
+                                            'addUserGroup'),true);
+        $this->cando['delUser']      = $this->_chkcnf(array(
+                                            'getUserID',
+                                            'delUser',
+                                            'delUserRefs'),true);
+        $this->cando['modLogin']     = $this->_chkcnf(array(
+                                            'getUserID',
+                                            'updateUser',
+                                            'UpdateTarget'),true);
+        $this->cando['modPass']      = $this->cando['modLogin'];
+        $this->cando['modName']      = $this->cando['modLogin'];
+        $this->cando['modMail']      = $this->cando['modLogin'];
+        $this->cando['modGroups']    = $this->_chkcnf(array(
+                                            'getUserID',
+                                            'getGroups',
+                                            'getGroupID',
+                                            'addGroup',
+                                            'addUserGroup',
+                                            'delGroup',
+                                            'getGroupID',
+                                            'delUserGroup'),true);
+        /* getGroups is not yet supported
+           $this->cando['getGroups']    = $this->_chkcnf(array('getGroups',
+           'getGroupID'),false); */
+        $this->cando['getUsers']     = $this->_chkcnf(array(
+                                            'getUsers',
+                                            'getUserInfo',
+                                            'getGroups'),false);
+        $this->cando['getUserCount'] = $this->_chkcnf(array('getUsers'),false);
     }
 
     /**
@@ -93,17 +102,17 @@ class auth_mysql extends auth_basic {
      * @return  bool
      */
     function _chkcnf($keys, $wop=false){
-      foreach ($keys as $key){
-        if (empty($this->cnf[$key])) return false;
-      }
+        foreach ($keys as $key){
+            if (empty($this->cnf[$key])) return false;
+        }
 
-      /* write operation and lock array filled with tables names? */
-      if ($wop && (!is_array($this->cnf['TablesToLock']) ||
-                   !count($this->cnf['TablesToLock']))){
-        return false;
-      }
+        /* write operation and lock array filled with tables names? */
+        if ($wop && (!is_array($this->cnf['TablesToLock']) ||
+                    !count($this->cnf['TablesToLock']))){
+            return false;
+        }
 
-      return true;
+        return true;
     }
 
     /**
@@ -122,23 +131,23 @@ class auth_mysql extends auth_basic {
      * @author  Matthias Grimm 
      */
     function checkPass($user,$pass){
-      $rc  = false;
-
-      if($this->_openDB()) {
-        $sql    = str_replace('%{user}',$this->_escape($user),$this->cnf['checkPass']);
-        $sql    = str_replace('%{pass}',$this->_escape($pass),$sql);
-        $sql    = str_replace('%{dgroup}',$this->_escape($this->defaultgroup),$sql);
-        $result = $this->_queryDB($sql);
-
-        if($result !== false && count($result) == 1) {
-          if($this->cnf['forwardClearPass'] == 1)
-            $rc = true;
-          else
-            $rc = auth_verifyPassword($pass,$result[0]['pass']);
+        $rc  = false;
+
+        if($this->_openDB()) {
+            $sql    = str_replace('%{user}',$this->_escape($user),$this->cnf['checkPass']);
+            $sql    = str_replace('%{pass}',$this->_escape($pass),$sql);
+            $sql    = str_replace('%{dgroup}',$this->_escape($this->defaultgroup),$sql);
+            $result = $this->_queryDB($sql);
+
+            if($result !== false && count($result) == 1) {
+                if($this->cnf['forwardClearPass'] == 1)
+                    $rc = true;
+                else
+                    $rc = auth_verifyPassword($pass,$result[0]['pass']);
+            }
+            $this->_closeDB();
         }
-        $this->_closeDB();
-      }
-      return $rc;
+        return $rc;
     }
 
     /**
@@ -156,14 +165,14 @@ class auth_mysql extends auth_basic {
      * @author  Matthias Grimm 
      */
     function getUserData($user){
-      if($this->_openDB()) {
-        $this->_lockTables("READ");
-        $info = $this->_getUserInfo($user);
-        $this->_unlockTables();
-        $this->_closeDB();
-      } else
-        $info = false;
-      return $info;
+        if($this->_openDB()) {
+            $this->_lockTables("READ");
+            $info = $this->_getUserInfo($user);
+            $this->_unlockTables();
+            $this->_closeDB();
+        } else
+            $info = false;
+        return $info;
     }
 
     /**
@@ -186,22 +195,22 @@ class auth_mysql extends auth_basic {
      * @author  Matthias Grimm 
      */
     function createUser($user,$pwd,$name,$mail,$grps=null){
-      if($this->_openDB()) {
-        if (($info = $this->_getUserInfo($user)) !== false)
-          return false;  // user already exists
-
-        // set defaultgroup if no groups were given
-        if ($grps == null)
-          $grps = array($this->defaultgroup);
-
-        $this->_lockTables("WRITE");
-        $pwd = $this->cnf['forwardClearPass'] ? $pwd : auth_cryptPassword($pwd);
-        $rc = $this->_addUser($user,$pwd,$name,$mail,$grps);
-        $this->_unlockTables();
-        $this->_closeDB();
-        if ($rc) return true;
-      }
-      return null;  // return error
+        if($this->_openDB()) {
+            if (($info = $this->_getUserInfo($user)) !== false)
+                return false;  // user already exists
+
+            // set defaultgroup if no groups were given
+            if ($grps == null)
+                $grps = array($this->defaultgroup);
+
+            $this->_lockTables("WRITE");
+            $pwd = $this->cnf['forwardClearPass'] ? $pwd : auth_cryptPassword($pwd);
+            $rc = $this->_addUser($user,$pwd,$name,$mail,$grps);
+            $this->_unlockTables();
+            $this->_closeDB();
+            if ($rc) return true;
+        }
+        return null;  // return error
     }
 
     /**
@@ -233,36 +242,36 @@ class auth_mysql extends auth_basic {
      * @author  Matthias Grimm 
      */
     function modifyUser($user, $changes) {
-      $rc = false;
+        $rc = false;
 
-      if (!is_array($changes) || !count($changes))
-        return true;  // nothing to change
+        if (!is_array($changes) || !count($changes))
+            return true;  // nothing to change
 
-      if($this->_openDB()) {
-        $this->_lockTables("WRITE");
+        if($this->_openDB()) {
+            $this->_lockTables("WRITE");
 
-        if (($uid = $this->_getUserID($user))) {
-          $rc = $this->_updateUserInfo($changes, $uid);
+            if (($uid = $this->_getUserID($user))) {
+                $rc = $this->_updateUserInfo($changes, $uid);
 
-          if ($rc && isset($changes['grps']) && $this->cando['modGroups']) {
-            $groups = $this->_getGroups($user);
-            $grpadd = array_diff($changes['grps'], $groups);
-            $grpdel = array_diff($groups, $changes['grps']);
+                if ($rc && isset($changes['grps']) && $this->cando['modGroups']) {
+                    $groups = $this->_getGroups($user);
+                    $grpadd = array_diff($changes['grps'], $groups);
+                    $grpdel = array_diff($groups, $changes['grps']);
 
-            foreach($grpadd as $group)
-              if (($this->_addUserToGroup($user, $group, 1)) == false)
-                $rc = false;
+                    foreach($grpadd as $group)
+                        if (($this->_addUserToGroup($user, $group, 1)) == false)
+                            $rc = false;
 
-            foreach($grpdel as $group)
-              if (($this->_delUserFromGroup($user, $group)) == false)
-                $rc = false;
-          }
-        }
+                    foreach($grpdel as $group)
+                        if (($this->_delUserFromGroup($user, $group)) == false)
+                            $rc = false;
+                }
+            }
 
-        $this->_unlockTables();
-        $this->_closeDB();
-      }
-      return $rc;
+            $this->_unlockTables();
+            $this->_closeDB();
+        }
+        return $rc;
     }
 
     /**
@@ -277,20 +286,20 @@ class auth_mysql extends auth_basic {
      * @author  Matthias Grimm 
      */
     function deleteUsers($users) {
-      $count = 0;
-
-      if($this->_openDB()) {
-        if (is_array($users) && count($users)) {
-          $this->_lockTables("WRITE");
-          foreach ($users as $user) {
-            if ($this->_delUser($user))
-              $count++;
-          }
-          $this->_unlockTables();
-        }
-        $this->_closeDB();
-      }
-      return $count;
+        $count = 0;
+
+        if($this->_openDB()) {
+            if (is_array($users) && count($users)) {
+                $this->_lockTables("WRITE");
+                foreach ($users as $user) {
+                    if ($this->_delUser($user))
+                        $count++;
+                }
+                $this->_unlockTables();
+            }
+            $this->_closeDB();
+        }
+        return $count;
     }
 
     /**
@@ -304,23 +313,23 @@ class auth_mysql extends auth_basic {
      * @author  Matthias Grimm 
      */
     function getUserCount($filter=array()) {
-      $rc = 0;
-
-      if($this->_openDB()) {
-        $sql = $this->_createSQLFilter($this->cnf['getUsers'], $filter);
-
-        if ($this->dbver >= 4) {
-          $sql = substr($sql, 6);  /* remove 'SELECT' or 'select' */
-          $sql = "SELECT SQL_CALC_FOUND_ROWS".$sql." LIMIT 1";
-          $this->_queryDB($sql);
-          $result = $this->_queryDB("SELECT FOUND_ROWS()");
-          $rc = $result[0]['FOUND_ROWS()'];
-        } else if (($result = $this->_queryDB($sql)))
-          $rc = count($result);
-
-        $this->_closeDB();
-      }
-      return $rc;
+        $rc = 0;
+
+        if($this->_openDB()) {
+            $sql = $this->_createSQLFilter($this->cnf['getUsers'], $filter);
+
+            if ($this->dbver >= 4) {
+                $sql = substr($sql, 6);  /* remove 'SELECT' or 'select' */
+                $sql = "SELECT SQL_CALC_FOUND_ROWS".$sql." LIMIT 1";
+                $this->_queryDB($sql);
+                $result = $this->_queryDB("SELECT FOUND_ROWS()");
+                $rc = $result[0]['FOUND_ROWS()'];
+            } else if (($result = $this->_queryDB($sql)))
+                $rc = count($result);
+
+            $this->_closeDB();
+        }
+        return $rc;
     }
 
     /**
@@ -334,24 +343,24 @@ class auth_mysql extends auth_basic {
      * @author  Matthias Grimm 
      */
     function retrieveUsers($first=0,$limit=10,$filter=array()) {
-      $out   = array();
-
-      if($this->_openDB()) {
-        $this->_lockTables("READ");
-        $sql  = $this->_createSQLFilter($this->cnf['getUsers'], $filter);
-        $sql .= " ".$this->cnf['SortOrder']." LIMIT $first, $limit";
-        $result = $this->_queryDB($sql);
+        $out   = array();
+
+        if($this->_openDB()) {
+            $this->_lockTables("READ");
+            $sql  = $this->_createSQLFilter($this->cnf['getUsers'], $filter);
+            $sql .= " ".$this->cnf['SortOrder']." LIMIT $first, $limit";
+            $result = $this->_queryDB($sql);
+
+            if (!empty($result)) {
+                foreach ($result as $user)
+                    if (($info = $this->_getUserInfo($user['user'])))
+                        $out[$user['user']] = $info;
+            }
 
-        if (!empty($result)) {
-          foreach ($result as $user)
-            if (($info = $this->_getUserInfo($user['user'])))
-              $out[$user['user']] = $info;
+            $this->_unlockTables();
+            $this->_closeDB();
         }
-
-        $this->_unlockTables();
-        $this->_closeDB();
-      }
-      return $out;
+        return $out;
     }
 
     /**
@@ -364,15 +373,15 @@ class auth_mysql extends auth_basic {
      * @author  Matthias Grimm 
      */
     function joinGroup($user, $group) {
-      $rc = false;
-
-      if ($this->_openDB()) {
-        $this->_lockTables("WRITE");
-        $rc  = $this->_addUserToGroup($user, $group);
-        $this->_unlockTables();
-        $this->_closeDB();
-      }
-      return $rc;
+        $rc = false;
+
+        if ($this->_openDB()) {
+            $this->_lockTables("WRITE");
+            $rc  = $this->_addUserToGroup($user, $group);
+            $this->_unlockTables();
+            $this->_closeDB();
+        }
+        return $rc;
     }
 
     /**
@@ -385,16 +394,16 @@ class auth_mysql extends auth_basic {
      * @author  Matthias Grimm 
      */
     function leaveGroup($user, $group) {
-      $rc = false;
-
-      if ($this->_openDB()) {
-        $this->_lockTables("WRITE");
-        $uid = $this->_getUserID($user);
-        $rc  = $this->_delUserFromGroup($user, $group);
-        $this->_unlockTables();
-        $this->_closeDB();
-      }
-      return $rc;
+        $rc = false;
+
+        if ($this->_openDB()) {
+            $this->_lockTables("WRITE");
+            $uid = $this->_getUserID($user);
+            $rc  = $this->_delUserFromGroup($user, $group);
+            $this->_unlockTables();
+            $this->_closeDB();
+        }
+        return $rc;
     }
 
     /**
@@ -422,36 +431,36 @@ class auth_mysql extends auth_basic {
      * @author Matthias Grimm 
      */
     function _addUserToGroup($user, $group, $force=0) {
-      $newgroup = 0;
-
-      if (($this->dbcon) && ($user)) {
-        $gid = $this->_getGroupID($group);
-        if (!$gid) {
-          if ($force) {  // create missing groups
-            $sql = str_replace('%{group}',$this->_escape($group),$this->cnf['addGroup']);
-            $gid = $this->_modifyDB($sql);
-            $newgroup = 1;  // group newly created
-          }
-          if (!$gid) return false; // group didn't exist and can't be created
-        }
-
-        $sql = $this->cnf['addUserGroup'];
-        if(strpos($sql,'%{uid}') !== false){
-            $uid = $this->_getUserID($user);
-            $sql = str_replace('%{uid}',  $this->_escape($uid),$sql);
-        }
-        $sql = str_replace('%{user}', $this->_escape($user),$sql);
-        $sql = str_replace('%{gid}',  $this->_escape($gid),$sql);
-        $sql = str_replace('%{group}',$this->_escape($group),$sql);
-        if ($this->_modifyDB($sql) !== false) return true;
+        $newgroup = 0;
+
+        if (($this->dbcon) && ($user)) {
+            $gid = $this->_getGroupID($group);
+            if (!$gid) {
+                if ($force) {  // create missing groups
+                    $sql = str_replace('%{group}',$this->_escape($group),$this->cnf['addGroup']);
+                    $gid = $this->_modifyDB($sql);
+                    $newgroup = 1;  // group newly created
+                }
+                if (!$gid) return false; // group didn't exist and can't be created
+            }
 
-        if ($newgroup) { // remove previously created group on error
-          $sql = str_replace('%{gid}',  $this->_escape($gid),$this->cnf['delGroup']);
-          $sql = str_replace('%{group}',$this->_escape($group),$sql);
-          $this->_modifyDB($sql);
+            $sql = $this->cnf['addUserGroup'];
+            if(strpos($sql,'%{uid}') !== false){
+                $uid = $this->_getUserID($user);
+                $sql = str_replace('%{uid}',  $this->_escape($uid),$sql);
+            }
+            $sql = str_replace('%{user}', $this->_escape($user),$sql);
+            $sql = str_replace('%{gid}',  $this->_escape($gid),$sql);
+            $sql = str_replace('%{group}',$this->_escape($group),$sql);
+            if ($this->_modifyDB($sql) !== false) return true;
+
+            if ($newgroup) { // remove previously created group on error
+                $sql = str_replace('%{gid}',  $this->_escape($gid),$this->cnf['delGroup']);
+                $sql = str_replace('%{group}',$this->_escape($group),$sql);
+                $this->_modifyDB($sql);
+            }
         }
-      }
-      return false;
+        return false;
     }
 
     /**
@@ -464,24 +473,23 @@ class auth_mysql extends auth_basic {
      * @author  Matthias Grimm 
      */
     function _delUserFromGroup($user, $group) {
-      $rc = false;
+        $rc = false;
 
-
-      if (($this->dbcon) && ($user)) {
-        $sql = $this->cnf['delUserGroup'];
-        if(strpos($sql,'%{uid}') !== false){
-            $uid = $this->_getUserID($user);
-            $sql = str_replace('%{uid}',  $this->_escape($uid),$sql);
-        }
-        $gid = $this->_getGroupID($group);
-        if ($gid) {
-          $sql = str_replace('%{user}', $this->_escape($user),$sql);
-          $sql = str_replace('%{gid}',  $this->_escape($gid),$sql);
-          $sql = str_replace('%{group}',$this->_escape($group),$sql);
-          $rc  = $this->_modifyDB($sql) == 0 ? true : false;
+        if (($this->dbcon) && ($user)) {
+            $sql = $this->cnf['delUserGroup'];
+            if(strpos($sql,'%{uid}') !== false){
+                $uid = $this->_getUserID($user);
+                $sql = str_replace('%{uid}',  $this->_escape($uid),$sql);
+            }
+            $gid = $this->_getGroupID($group);
+            if ($gid) {
+                $sql = str_replace('%{user}', $this->_escape($user),$sql);
+                $sql = str_replace('%{gid}',  $this->_escape($gid),$sql);
+                $sql = str_replace('%{group}',$this->_escape($group),$sql);
+                $rc  = $this->_modifyDB($sql) == 0 ? true : false;
+            }
         }
-      }
-      return $rc;
+        return $rc;
     }
 
     /**
@@ -498,19 +506,19 @@ class auth_mysql extends auth_basic {
      * @author Matthias Grimm 
      */
     function _getGroups($user) {
-      $groups = array();
+        $groups = array();
 
-      if($this->dbcon) {
-        $sql = str_replace('%{user}',$this->_escape($user),$this->cnf['getGroups']);
-        $result = $this->_queryDB($sql);
+        if($this->dbcon) {
+            $sql = str_replace('%{user}',$this->_escape($user),$this->cnf['getGroups']);
+            $result = $this->_queryDB($sql);
 
-        if($result !== false && count($result)) {
-          foreach($result as $row)
-            $groups[] = $row['group'];
+            if($result !== false && count($result)) {
+                foreach($result as $row)
+                    $groups[] = $row['group'];
+            }
+            return $groups;
         }
-        return $groups;
-      }
-      return false;
+        return false;
     }
 
     /**
@@ -526,12 +534,12 @@ class auth_mysql extends auth_basic {
      * @author Matthias Grimm 
      */
     function _getUserID($user) {
-      if($this->dbcon) {
-        $sql = str_replace('%{user}',$this->_escape($user),$this->cnf['getUserID']);
-        $result = $this->_queryDB($sql);
-        return $result === false ? false : $result[0]['id'];
-      }
-      return false;
+        if($this->dbcon) {
+            $sql = str_replace('%{user}',$this->_escape($user),$this->cnf['getUserID']);
+            $result = $this->_queryDB($sql);
+            return $result === false ? false : $result[0]['id'];
+        }
+        return false;
     }
 
     /**
@@ -553,33 +561,33 @@ class auth_mysql extends auth_basic {
      * @author  Matthias Grimm 
      */
     function _addUser($user,$pwd,$name,$mail,$grps){
-      if($this->dbcon && is_array($grps)) {
-        $sql = str_replace('%{user}', $this->_escape($user),$this->cnf['addUser']);
-        $sql = str_replace('%{pass}', $this->_escape($pwd),$sql);
-        $sql = str_replace('%{name}', $this->_escape($name),$sql);
-        $sql = str_replace('%{email}',$this->_escape($mail),$sql);
-        $uid = $this->_modifyDB($sql);
-
-        if ($uid) {
-          foreach($grps as $group) {
-            $gid = $this->_addUserToGroup($user, $group, 1);
-            if ($gid === false) break;
-          }
-
-          if ($gid) return true;
-          else {
-            /* remove the new user and all group relations if a group can't
-             * be assigned. Newly created groups will remain in the database
-             * and won't be removed. This might create orphaned groups but
-             * is not a big issue so we ignore this problem here.
-             */
-            $this->_delUser($user);
-            if ($this->cnf['debug'])
-              msg ("MySQL err: Adding user '$user' to group '$group' failed.",-1,__LINE__,__FILE__);
-          }
+        if($this->dbcon && is_array($grps)) {
+            $sql = str_replace('%{user}', $this->_escape($user),$this->cnf['addUser']);
+            $sql = str_replace('%{pass}', $this->_escape($pwd),$sql);
+            $sql = str_replace('%{name}', $this->_escape($name),$sql);
+            $sql = str_replace('%{email}',$this->_escape($mail),$sql);
+            $uid = $this->_modifyDB($sql);
+
+            if ($uid) {
+                foreach($grps as $group) {
+                    $gid = $this->_addUserToGroup($user, $group, 1);
+                    if ($gid === false) break;
+                }
+
+                if ($gid) return true;
+                else {
+                    /* remove the new user and all group relations if a group can't
+                     * be assigned. Newly created groups will remain in the database
+                     * and won't be removed. This might create orphaned groups but
+                     * is not a big issue so we ignore this problem here.
+                     */
+                    $this->_delUser($user);
+                    if ($this->cnf['debug'])
+                        msg ("MySQL err: Adding user '$user' to group '$group' failed.",-1,__LINE__,__FILE__);
+                }
+            }
         }
-      }
-      return false;
+        return false;
     }
 
     /**
@@ -595,18 +603,18 @@ class auth_mysql extends auth_basic {
      * @author Matthias Grimm 
      */
     function _delUser($user) {
-      if($this->dbcon) {
-        $uid = $this->_getUserID($user);
-        if ($uid) {
-          $sql = str_replace('%{uid}',$this->_escape($uid),$this->cnf['delUserRefs']);
-          $this->_modifyDB($sql);
-          $sql = str_replace('%{uid}',$this->_escape($uid),$this->cnf['delUser']);
-          $sql = str_replace('%{user}',  $this->_escape($user),$sql);
-          $this->_modifyDB($sql);
-          return true;
-        }
-      }
-      return false;
+        if($this->dbcon) {
+            $uid = $this->_getUserID($user);
+            if ($uid) {
+                $sql = str_replace('%{uid}',$this->_escape($uid),$this->cnf['delUserRefs']);
+                $this->_modifyDB($sql);
+                $sql = str_replace('%{uid}',$this->_escape($uid),$this->cnf['delUser']);
+                $sql = str_replace('%{user}',  $this->_escape($user),$sql);
+                $this->_modifyDB($sql);
+                return true;
+            }
+        }
+        return false;
     }
 
     /**
@@ -623,14 +631,14 @@ class auth_mysql extends auth_basic {
      * @author Matthias Grimm 
      */
     function _getUserInfo($user){
-      $sql = str_replace('%{user}',$this->_escape($user),$this->cnf['getUserInfo']);
-      $result = $this->_queryDB($sql);
-      if($result !== false && count($result)) {
-        $info = $result[0];
-        $info['grps'] = $this->_getGroups($user);
-        return $info;
-      }
-      return false;
+        $sql = str_replace('%{user}',$this->_escape($user),$this->cnf['getUserInfo']);
+        $result = $this->_queryDB($sql);
+        if($result !== false && count($result)) {
+            $info = $result[0];
+            $info['grps'] = $this->_getGroups($user);
+            return $info;
+        }
+        return false;
     }
 
     /**
@@ -653,43 +661,43 @@ class auth_mysql extends auth_basic {
      * @author Matthias Grimm 
      */
     function _updateUserInfo($changes, $uid) {
-      $sql  = $this->cnf['updateUser']." ";
-      $cnt = 0;
-      $err = 0;
-
-      if($this->dbcon) {
-        foreach ($changes as $item => $value) {
-          if ($item == 'user') {
-            if (($this->_getUserID($changes['user']))) {
-              $err = 1; /* new username already exists */
-              break;    /* abort update */
+        $sql  = $this->cnf['updateUser']." ";
+        $cnt = 0;
+        $err = 0;
+
+        if($this->dbcon) {
+            foreach ($changes as $item => $value) {
+                if ($item == 'user') {
+                    if (($this->_getUserID($changes['user']))) {
+                        $err = 1; /* new username already exists */
+                        break;    /* abort update */
+                    }
+                    if ($cnt++ > 0) $sql .= ", ";
+                    $sql .= str_replace('%{user}',$value,$this->cnf['UpdateLogin']);
+                } else if ($item == 'name') {
+                    if ($cnt++ > 0) $sql .= ", ";
+                    $sql .= str_replace('%{name}',$value,$this->cnf['UpdateName']);
+                } else if ($item == 'pass') {
+                    if (!$this->cnf['forwardClearPass'])
+                        $value = auth_cryptPassword($value);
+                    if ($cnt++ > 0) $sql .= ", ";
+                    $sql .= str_replace('%{pass}',$value,$this->cnf['UpdatePass']);
+                } else if ($item == 'mail') {
+                    if ($cnt++ > 0) $sql .= ", ";
+                    $sql .= str_replace('%{email}',$value,$this->cnf['UpdateEmail']);
+                }
             }
-            if ($cnt++ > 0) $sql .= ", ";
-            $sql .= str_replace('%{user}',$value,$this->cnf['UpdateLogin']);
-          } else if ($item == 'name') {
-            if ($cnt++ > 0) $sql .= ", ";
-            $sql .= str_replace('%{name}',$value,$this->cnf['UpdateName']);
-          } else if ($item == 'pass') {
-            if (!$this->cnf['forwardClearPass'])
-              $value = auth_cryptPassword($value);
-            if ($cnt++ > 0) $sql .= ", ";
-            $sql .= str_replace('%{pass}',$value,$this->cnf['UpdatePass']);
-          } else if ($item == 'mail') {
-            if ($cnt++ > 0) $sql .= ", ";
-            $sql .= str_replace('%{email}',$value,$this->cnf['UpdateEmail']);
-          }
-        }
-
-        if ($err == 0) {
-          if ($cnt > 0) {
-            $sql .= " ".str_replace('%{uid}', $uid, $this->cnf['UpdateTarget']);
-            if(get_class($this) == 'auth_mysql') $sql .= " LIMIT 1"; //some PgSQL inheritance comp.
-            $this->_modifyDB($sql);
-          }
-          return true;
-        }
-      }
-      return false;
+
+            if ($err == 0) {
+                if ($cnt > 0) {
+                    $sql .= " ".str_replace('%{uid}', $uid, $this->cnf['UpdateTarget']);
+                    if(get_class($this) == 'auth_mysql') $sql .= " LIMIT 1"; //some PgSQL inheritance comp.
+                    $this->_modifyDB($sql);
+                }
+                return true;
+            }
+        }
+        return false;
     }
 
     /**
@@ -705,12 +713,12 @@ class auth_mysql extends auth_basic {
      * @author Matthias Grimm 
      */
     function _getGroupID($group) {
-      if($this->dbcon) {
-        $sql = str_replace('%{group}',$this->_escape($group),$this->cnf['getGroupID']);
-        $result = $this->_queryDB($sql);
-        return $result === false ? false : $result[0]['id'];
-      }
-      return false;
+        if($this->dbcon) {
+            $sql = str_replace('%{group}',$this->_escape($group),$this->cnf['getGroupID']);
+            $result = $this->_queryDB($sql);
+            return $result === false ? false : $result[0]['id'];
+        }
+        return false;
     }
 
     /**
@@ -723,32 +731,32 @@ class auth_mysql extends auth_basic {
      * @author Matthias Grimm 
      */
     function _openDB() {
-      if (!$this->dbcon) {
-        $con = @mysql_connect ($this->cnf['server'], $this->cnf['user'], $this->cnf['password']);
-        if ($con) {
-          if ((mysql_select_db($this->cnf['database'], $con))) {
-            if ((preg_match("/^(\d+)\.(\d+)\.(\d+).*/", mysql_get_server_info ($con), $result)) == 1) {
-              $this->dbver = $result[1];
-              $this->dbrev = $result[2];
-              $this->dbsub = $result[3];
-            }
-            $this->dbcon = $con;
-            if(!empty($this->cnf['charset'])){
-                 mysql_query('SET CHARACTER SET "' . $this->cnf['charset'] . '"', $con);
-            }
-            return true;   // connection and database successfully opened
-          } else {
-            mysql_close ($con);
-            if ($this->cnf['debug'])
-              msg("MySQL err: No access to database {$this->cnf['database']}.",-1,__LINE__,__FILE__);
-          }
-        } else if ($this->cnf['debug'])
-          msg ("MySQL err: Connection to {$this->cnf['user']}@{$this->cnf['server']} not possible.",
-               -1,__LINE__,__FILE__);
-
-        return false;  // connection failed
-      }
-      return true;  // connection already open
+        if (!$this->dbcon) {
+            $con = @mysql_connect ($this->cnf['server'], $this->cnf['user'], $this->cnf['password']);
+            if ($con) {
+                if ((mysql_select_db($this->cnf['database'], $con))) {
+                    if ((preg_match("/^(\d+)\.(\d+)\.(\d+).*/", mysql_get_server_info ($con), $result)) == 1) {
+                        $this->dbver = $result[1];
+                        $this->dbrev = $result[2];
+                        $this->dbsub = $result[3];
+                    }
+                    $this->dbcon = $con;
+                    if(!empty($this->cnf['charset'])){
+                        mysql_query('SET CHARACTER SET "' . $this->cnf['charset'] . '"', $con);
+                    }
+                    return true;   // connection and database successfully opened
+                } else {
+                    mysql_close ($con);
+                    if ($this->cnf['debug'])
+                        msg("MySQL err: No access to database {$this->cnf['database']}.",-1,__LINE__,__FILE__);
+                }
+            } else if ($this->cnf['debug'])
+                msg ("MySQL err: Connection to {$this->cnf['user']}@{$this->cnf['server']} not possible.",
+                        -1,__LINE__,__FILE__);
+
+            return false;  // connection failed
+        }
+        return true;  // connection already open
     }
 
     /**
@@ -757,10 +765,10 @@ class auth_mysql extends auth_basic {
      * @author Matthias Grimm 
      */
     function _closeDB() {
-      if ($this->dbcon) {
-        mysql_close ($this->dbcon);
-        $this->dbcon = 0;
-      }
+        if ($this->dbcon) {
+            mysql_close ($this->dbcon);
+            $this->dbcon = 0;
+        }
     }
 
     /**
@@ -776,23 +784,23 @@ class auth_mysql extends auth_basic {
      * @author Matthias Grimm 
      */
     function _queryDB($query) {
-      if($this->cnf['debug'] >= 2){
-        msg('MySQL query: '.hsc($query),0,__LINE__,__FILE__);
-      }
-
-      $resultarray = array();
-      if ($this->dbcon) {
-        $result = @mysql_query($query,$this->dbcon);
-        if ($result) {
-          while (($t = mysql_fetch_assoc($result)) !== false)
-            $resultarray[]=$t;
-          mysql_free_result ($result);
-          return $resultarray;
-        }
-        if ($this->cnf['debug'])
-          msg('MySQL err: '.mysql_error($this->dbcon),-1,__LINE__,__FILE__);
-      }
-      return false;
+        if($this->cnf['debug'] >= 2){
+            msg('MySQL query: '.hsc($query),0,__LINE__,__FILE__);
+        }
+
+        $resultarray = array();
+        if ($this->dbcon) {
+            $result = @mysql_query($query,$this->dbcon);
+            if ($result) {
+                while (($t = mysql_fetch_assoc($result)) !== false)
+                    $resultarray[]=$t;
+                mysql_free_result ($result);
+                return $resultarray;
+            }
+            if ($this->cnf['debug'])
+                msg('MySQL err: '.mysql_error($this->dbcon),-1,__LINE__,__FILE__);
+        }
+        return false;
     }
 
     /**
@@ -807,16 +815,16 @@ class auth_mysql extends auth_basic {
      * @author Matthias Grimm 
      */
     function _modifyDB($query) {
-      if ($this->dbcon) {
-        $result = @mysql_query($query,$this->dbcon);
-        if ($result) {
-          $rc = mysql_insert_id($this->dbcon); //give back ID on insert
-          if ($rc !== false) return $rc;
-        }
-        if ($this->cnf['debug'])
-          msg('MySQL err: '.mysql_error($this->dbcon),-1,__LINE__,__FILE__);
-      }
-      return false;
+        if ($this->dbcon) {
+            $result = @mysql_query($query,$this->dbcon);
+            if ($result) {
+                $rc = mysql_insert_id($this->dbcon); //give back ID on insert
+                if ($rc !== false) return $rc;
+            }
+            if ($this->cnf['debug'])
+                msg('MySQL err: '.mysql_error($this->dbcon),-1,__LINE__,__FILE__);
+        }
+        return false;
     }
 
     /**
@@ -838,21 +846,21 @@ class auth_mysql extends auth_basic {
      * @author Matthias Grimm 
      */
     function _lockTables($mode) {
-      if ($this->dbcon) {
-        if (is_array($this->cnf['TablesToLock']) && !empty($this->cnf['TablesToLock'])) {
-          if ($mode == "READ" || $mode == "WRITE") {
-            $sql = "LOCK TABLES ";
-            $cnt = 0;
-            foreach ($this->cnf['TablesToLock'] as $table) {
-              if ($cnt++ != 0) $sql .= ", ";
-              $sql .= "$table $mode";
+        if ($this->dbcon) {
+            if (is_array($this->cnf['TablesToLock']) && !empty($this->cnf['TablesToLock'])) {
+                if ($mode == "READ" || $mode == "WRITE") {
+                    $sql = "LOCK TABLES ";
+                    $cnt = 0;
+                    foreach ($this->cnf['TablesToLock'] as $table) {
+                        if ($cnt++ != 0) $sql .= ", ";
+                        $sql .= "$table $mode";
+                    }
+                    $this->_modifyDB($sql);
+                    return true;
+                }
             }
-            $this->_modifyDB($sql);
-            return true;
-          }
         }
-      }
-      return false;
+        return false;
     }
 
     /**
@@ -862,11 +870,11 @@ class auth_mysql extends auth_basic {
      * @author Matthias Grimm 
      */
     function _unlockTables() {
-      if ($this->dbcon) {
-        $this->_modifyDB("UNLOCK TABLES");
-        return true;
-      }
-      return false;
+        if ($this->dbcon) {
+            $this->_modifyDB("UNLOCK TABLES");
+            return true;
+        }
+        return false;
     }
 
     /**
@@ -882,38 +890,38 @@ class auth_mysql extends auth_basic {
      * @author Matthias Grimm 
      */
     function _createSQLFilter($sql, $filter) {
-      $SQLfilter = "";
-      $cnt = 0;
-
-      if ($this->dbcon) {
-        foreach ($filter as $item => $pattern) {
-          $tmp = '%'.$this->_escape($pattern).'%';
-          if ($item == 'user') {
-            if ($cnt++ > 0) $SQLfilter .= " AND ";
-            $SQLfilter .= str_replace('%{user}',$tmp,$this->cnf['FilterLogin']);
-          } else if ($item == 'name') {
-            if ($cnt++ > 0) $SQLfilter .= " AND ";
-            $SQLfilter .= str_replace('%{name}',$tmp,$this->cnf['FilterName']);
-          } else if ($item == 'mail') {
-            if ($cnt++ > 0) $SQLfilter .= " AND ";
-            $SQLfilter .= str_replace('%{email}',$tmp,$this->cnf['FilterEmail']);
-          } else if ($item == 'grps') {
-            if ($cnt++ > 0) $SQLfilter .= " AND ";
-            $SQLfilter .= str_replace('%{group}',$tmp,$this->cnf['FilterGroup']);
-          }
-        }
-
-        // we have to check SQLfilter here and must not use $cnt because if
-        // any of cnf['Filter????'] is not defined, a malformed SQL string
-        // would be generated.
-
-        if (strlen($SQLfilter)) {
-          $glue = strpos(strtolower($sql),"where") ? " AND " : " WHERE ";
-          $sql = $sql.$glue.$SQLfilter;
-        }
-      }
-
-      return $sql;
+        $SQLfilter = "";
+        $cnt = 0;
+
+        if ($this->dbcon) {
+            foreach ($filter as $item => $pattern) {
+                $tmp = '%'.$this->_escape($pattern).'%';
+                if ($item == 'user') {
+                    if ($cnt++ > 0) $SQLfilter .= " AND ";
+                    $SQLfilter .= str_replace('%{user}',$tmp,$this->cnf['FilterLogin']);
+                } else if ($item == 'name') {
+                    if ($cnt++ > 0) $SQLfilter .= " AND ";
+                    $SQLfilter .= str_replace('%{name}',$tmp,$this->cnf['FilterName']);
+                } else if ($item == 'mail') {
+                    if ($cnt++ > 0) $SQLfilter .= " AND ";
+                    $SQLfilter .= str_replace('%{email}',$tmp,$this->cnf['FilterEmail']);
+                } else if ($item == 'grps') {
+                    if ($cnt++ > 0) $SQLfilter .= " AND ";
+                    $SQLfilter .= str_replace('%{group}',$tmp,$this->cnf['FilterGroup']);
+                }
+            }
+
+            // we have to check SQLfilter here and must not use $cnt because if
+            // any of cnf['Filter????'] is not defined, a malformed SQL string
+            // would be generated.
+
+            if (strlen($SQLfilter)) {
+                $glue = strpos(strtolower($sql),"where") ? " AND " : " WHERE ";
+                $sql = $sql.$glue.$SQLfilter;
+            }
+        }
+
+        return $sql;
     }
 
     /**
@@ -924,15 +932,15 @@ class auth_mysql extends auth_basic {
      * @param  boolean $like   Escape wildcard chars as well?
      */
     function _escape($string,$like=false){
-      if($this->dbcon){
-        $string = mysql_real_escape_string($string, $this->dbcon);
-      }else{
-        $string = addslashes($string);
-      }
-      if($like){
-        $string = addcslashes($string,'%_');
-      }
-      return $string;
+        if($this->dbcon){
+            $string = mysql_real_escape_string($string, $this->dbcon);
+        }else{
+            $string = addslashes($string);
+        }
+        if($like){
+            $string = addcslashes($string,'%_');
+        }
+        return $string;
     }
 }
 
diff --git a/inc/auth/pgsql.class.php b/inc/auth/pgsql.class.php
index cf8bf7600..b422b100d 100644
--- a/inc/auth/pgsql.class.php
+++ b/inc/auth/pgsql.class.php
@@ -9,7 +9,7 @@
  * @author     Andreas Gohr 
  * @author     Chris Smith 
  * @author     Matthias Grimm 
-*/
+ */
 
 require_once(DOKU_INC.'inc/auth/mysql.class.php');
 
@@ -24,63 +24,72 @@ class auth_pgsql extends auth_mysql {
      * @author Matthias Grimm 
      * @author Andreas Gohr 
      */
-    function auth_pgsql() {
-      global $conf;
-      $this->cnf          = $conf['auth']['pgsql'];
-      if(!$this->cnf['port']) $this->cnf['port'] = 5432;
-
-      if (method_exists($this, 'auth_basic'))
-        parent::auth_basic();
-
-      if(!function_exists('pg_connect')) {
-        if ($this->cnf['debug'])
-          msg("PgSQL err: PHP Postgres extension not found.",-1);
-        $this->success = false;
-        return;
-      }
-
-      $this->defaultgroup = $conf['defaultgroup'];
-
-      // set capabilities based upon config strings set
-      if (empty($this->cnf['user']) ||
-          empty($this->cnf['password']) || empty($this->cnf['database'])){
-        if ($this->cnf['debug'])
-          msg("PgSQL err: insufficient configuration.",-1,__LINE__,__FILE__);
-        $this->success = false;
-        return;
-      }
-
-      $this->cando['addUser']      = $this->_chkcnf(array('getUserInfo',
-                                                          'getGroups',
-                                                          'addUser',
-                                                          'getUserID',
-                                                          'getGroupID',
-                                                          'addGroup',
-                                                          'addUserGroup'));
-      $this->cando['delUser']      = $this->_chkcnf(array('getUserID',
-                                                          'delUser',
-                                                          'delUserRefs'));
-      $this->cando['modLogin']     = $this->_chkcnf(array('getUserID',
-                                                          'updateUser',
-                                                          'UpdateTarget'));
-      $this->cando['modPass']      = $this->cando['modLogin'];
-      $this->cando['modName']      = $this->cando['modLogin'];
-      $this->cando['modMail']      = $this->cando['modLogin'];
-      $this->cando['modGroups']    = $this->_chkcnf(array('getUserID',
-                                                          'getGroups',
-                                                          'getGroupID',
-                                                          'addGroup',
-                                                          'addUserGroup',
-                                                          'delGroup',
-                                                          'getGroupID',
-                                                          'delUserGroup'));
-      /* getGroups is not yet supported
-      $this->cando['getGroups']    = $this->_chkcnf(array('getGroups',
-                                                          'getGroupID')); */
-      $this->cando['getUsers']     = $this->_chkcnf(array('getUsers',
-                                                          'getUserInfo',
-                                                          'getGroups'));
-      $this->cando['getUserCount'] = $this->_chkcnf(array('getUsers'));
+    function __construct() {
+        global $conf;
+        $this->cnf = $conf['auth']['pgsql'];
+        if(!$this->cnf['port']){
+            $this->cnf['port'] = 5432;
+        }
+
+        if (method_exists($this, 'auth_basic')){
+            parent::auth_basic();
+        }
+
+        if(!function_exists('pg_connect')) {
+            if ($this->cnf['debug'])
+                msg("PgSQL err: PHP Postgres extension not found.",-1);
+            $this->success = false;
+            return;
+        }
+
+        $this->defaultgroup = $conf['defaultgroup'];
+
+        // set capabilities based upon config strings set
+        if (empty($this->cnf['user']) ||
+            empty($this->cnf['password']) || empty($this->cnf['database'])){
+            if ($this->cnf['debug']){
+                msg("PgSQL err: insufficient configuration.",-1,__LINE__,__FILE__);
+            }
+            $this->success = false;
+            return;
+        }
+
+        $this->cando['addUser']     = $this->_chkcnf(array(
+                                        'getUserInfo',
+                                        'getGroups',
+                                        'addUser',
+                                        'getUserID',
+                                        'getGroupID',
+                                        'addGroup',
+                                        'addUserGroup'));
+        $this->cando['delUser']      = $this->_chkcnf(array(
+                                        'getUserID',
+                                        'delUser',
+                                        'delUserRefs'));
+        $this->cando['modLogin']     = $this->_chkcnf(array(
+                                        'getUserID',
+                                        'updateUser',
+                                        'UpdateTarget'));
+        $this->cando['modPass']      = $this->cando['modLogin'];
+        $this->cando['modName']      = $this->cando['modLogin'];
+        $this->cando['modMail']      = $this->cando['modLogin'];
+        $this->cando['modGroups']    = $this->_chkcnf(array(
+                                        'getUserID',
+                                        'getGroups',
+                                        'getGroupID',
+                                        'addGroup',
+                                        'addUserGroup',
+                                        'delGroup',
+                                        'getGroupID',
+                                        'delUserGroup'));
+        /* getGroups is not yet supported
+           $this->cando['getGroups']    = $this->_chkcnf(array('getGroups',
+           'getGroupID')); */
+        $this->cando['getUsers']     = $this->_chkcnf(array(
+                                        'getUsers',
+                                        'getUserInfo',
+                                        'getGroups'));
+        $this->cando['getUserCount'] = $this->_chkcnf(array('getUsers'));
     }
 
     /**
@@ -90,10 +99,10 @@ class auth_pgsql extends auth_mysql {
      * @return  bool
      */
     function _chkcnf($keys, $wop=false){
-      foreach ($keys as $key){
-        if (empty($this->cnf[$key])) return false;
-      }
-      return true;
+        foreach ($keys as $key){
+            if (empty($this->cnf[$key])) return false;
+        }
+        return true;
     }
 
     // @inherit function checkPass($user,$pass)
@@ -114,18 +123,18 @@ class auth_pgsql extends auth_mysql {
      * @author  Matthias Grimm 
      */
     function getUserCount($filter=array()) {
-      $rc = 0;
+        $rc = 0;
 
-      if($this->_openDB()) {
-        $sql = $this->_createSQLFilter($this->cnf['getUsers'], $filter);
+        if($this->_openDB()) {
+            $sql = $this->_createSQLFilter($this->cnf['getUsers'], $filter);
 
-        // no equivalent of SQL_CALC_FOUND_ROWS in pgsql?
-        if (($result = $this->_queryDB($sql))){
-          $rc = count($result);
+            // no equivalent of SQL_CALC_FOUND_ROWS in pgsql?
+            if (($result = $this->_queryDB($sql))){
+                $rc = count($result);
+            }
+            $this->_closeDB();
         }
-        $this->_closeDB();
-      }
-      return $rc;
+        return $rc;
     }
 
     /**
@@ -139,22 +148,22 @@ class auth_pgsql extends auth_mysql {
      * @author  Matthias Grimm 
      */
     function retrieveUsers($first=0,$limit=10,$filter=array()) {
-      $out   = array();
-
-      if($this->_openDB()) {
-        $this->_lockTables("READ");
-        $sql  = $this->_createSQLFilter($this->cnf['getUsers'], $filter);
-        $sql .= " ".$this->cnf['SortOrder']." LIMIT $limit OFFSET $first";
-        $result = $this->_queryDB($sql);
-
-        foreach ($result as $user)
-          if (($info = $this->_getUserInfo($user['user'])))
-            $out[$user['user']] = $info;
-
-        $this->_unlockTables();
-        $this->_closeDB();
-      }
-      return $out;
+        $out   = array();
+
+        if($this->_openDB()) {
+            $this->_lockTables("READ");
+            $sql  = $this->_createSQLFilter($this->cnf['getUsers'], $filter);
+            $sql .= " ".$this->cnf['SortOrder']." LIMIT $limit OFFSET $first";
+            $result = $this->_queryDB($sql);
+
+            foreach ($result as $user)
+                if (($info = $this->_getUserInfo($user['user'])))
+                    $out[$user['user']] = $info;
+
+            $this->_unlockTables();
+            $this->_closeDB();
+        }
+        return $out;
     }
 
     // @inherit function joinGroup($user, $group)
@@ -177,38 +186,38 @@ class auth_pgsql extends auth_mysql {
      * @author Andreas Gohr   
      */
     function _addUserToGroup($user, $group, $force=0) {
-      $newgroup = 0;
-
-      if (($this->dbcon) && ($user)) {
-        $gid = $this->_getGroupID($group);
-        if (!$gid) {
-          if ($force) {  // create missing groups
-            $sql = str_replace('%{group}',addslashes($group),$this->cnf['addGroup']);
-            $this->_modifyDB($sql);
-            //group should now exists try again to fetch it
-            $gid = $this->_getGroupID($group);
-            $newgroup = 1;  // group newly created
-          }
-        }
-        if (!$gid) return false; // group didn't exist and can't be created
+        $newgroup = 0;
 
-        $sql = $this->cnf['addUserGroup'];
-        if(strpos($sql,'%{uid}') !== false){
-            $uid = $this->_getUserID($user);
-            $sql = str_replace('%{uid}', addslashes($uid), $sql);
-        }
-        $sql = str_replace('%{user}', addslashes($user),$sql);
-        $sql = str_replace('%{gid}',  addslashes($gid),$sql);
-        $sql = str_replace('%{group}',addslashes($group),$sql);
-        if ($this->_modifyDB($sql) !== false) return true;
-
-        if ($newgroup) { // remove previously created group on error
-          $sql = str_replace('%{gid}',  addslashes($gid),$this->cnf['delGroup']);
-          $sql = str_replace('%{group}',addslashes($group),$sql);
-          $this->_modifyDB($sql);
+        if (($this->dbcon) && ($user)) {
+            $gid = $this->_getGroupID($group);
+            if (!$gid) {
+                if ($force) {  // create missing groups
+                    $sql = str_replace('%{group}',addslashes($group),$this->cnf['addGroup']);
+                    $this->_modifyDB($sql);
+                    //group should now exists try again to fetch it
+                    $gid = $this->_getGroupID($group);
+                    $newgroup = 1;  // group newly created
+                }
+            }
+            if (!$gid) return false; // group didn't exist and can't be created
+
+            $sql = $this->cnf['addUserGroup'];
+            if(strpos($sql,'%{uid}') !== false){
+                $uid = $this->_getUserID($user);
+                $sql = str_replace('%{uid}', addslashes($uid), $sql);
+            }
+            $sql = str_replace('%{user}', addslashes($user),$sql);
+            $sql = str_replace('%{gid}',  addslashes($gid),$sql);
+            $sql = str_replace('%{group}',addslashes($group),$sql);
+            if ($this->_modifyDB($sql) !== false) return true;
+
+            if ($newgroup) { // remove previously created group on error
+                $sql = str_replace('%{gid}',  addslashes($gid),$this->cnf['delGroup']);
+                $sql = str_replace('%{group}',addslashes($group),$sql);
+                $this->_modifyDB($sql);
+            }
         }
-      }
-      return false;
+        return false;
     }
 
     // @inherit function _delUserFromGroup($user $group)
@@ -234,37 +243,37 @@ class auth_pgsql extends auth_mysql {
      * @author  Matthias Grimm 
      */
     function _addUser($user,$pwd,$name,$mail,$grps){
-      if($this->dbcon && is_array($grps)) {
-        $sql = str_replace('%{user}', addslashes($user),$this->cnf['addUser']);
-        $sql = str_replace('%{pass}', addslashes($pwd),$sql);
-        $sql = str_replace('%{name}', addslashes($name),$sql);
-        $sql = str_replace('%{email}',addslashes($mail),$sql);
-        if($this->_modifyDB($sql)){
-          $uid = $this->_getUserID($user);
-        }else{
-          return false;
+        if($this->dbcon && is_array($grps)) {
+            $sql = str_replace('%{user}', addslashes($user),$this->cnf['addUser']);
+            $sql = str_replace('%{pass}', addslashes($pwd),$sql);
+            $sql = str_replace('%{name}', addslashes($name),$sql);
+            $sql = str_replace('%{email}',addslashes($mail),$sql);
+            if($this->_modifyDB($sql)){
+                $uid = $this->_getUserID($user);
+            }else{
+                return false;
+            }
+
+            if ($uid) {
+                foreach($grps as $group) {
+                    $gid = $this->_addUserToGroup($user, $group, 1);
+                    if ($gid === false) break;
+                }
+
+                if ($gid) return true;
+                else {
+                    /* remove the new user and all group relations if a group can't
+                     * be assigned. Newly created groups will remain in the database
+                     * and won't be removed. This might create orphaned groups but
+                     * is not a big issue so we ignore this problem here.
+                     */
+                    $this->_delUser($user);
+                    if ($this->cnf['debug'])
+                        msg("PgSQL err: Adding user '$user' to group '$group' failed.",-1,__LINE__,__FILE__);
+                }
+            }
         }
-
-        if ($uid) {
-          foreach($grps as $group) {
-            $gid = $this->_addUserToGroup($user, $group, 1);
-            if ($gid === false) break;
-          }
-
-          if ($gid) return true;
-          else {
-            /* remove the new user and all group relations if a group can't
-             * be assigned. Newly created groups will remain in the database
-             * and won't be removed. This might create orphaned groups but
-             * is not a big issue so we ignore this problem here.
-             */
-            $this->_delUser($user);
-            if ($this->cnf['debug'])
-              msg("PgSQL err: Adding user '$user' to group '$group' failed.",-1,__LINE__,__FILE__);
-          }
-        }
-      }
-      return false;
+        return false;
     }
 
     // @inherit function _delUser($user)
@@ -282,24 +291,24 @@ class auth_pgsql extends auth_mysql {
      * @author Matthias Grimm 
      */
     function _openDB() {
-      if (!$this->dbcon) {
-        $dsn  = $this->cnf['server'] ? 'host='.$this->cnf['server'] : '';
-        $dsn .= ' port='.$this->cnf['port'];
-        $dsn .= ' dbname='.$this->cnf['database'];
-        $dsn .= ' user='.$this->cnf['user'];
-        $dsn .= ' password='.$this->cnf['password'];
-
-        $con = @pg_connect($dsn);
-        if ($con) {
-            $this->dbcon = $con;
-            return true;   // connection and database successfully opened
-        } else if ($this->cnf['debug']){
-            msg ("PgSQL err: Connection to {$this->cnf['user']}@{$this->cnf['server']} not possible.",
-                  -1,__LINE__,__FILE__);
+        if (!$this->dbcon) {
+            $dsn  = $this->cnf['server'] ? 'host='.$this->cnf['server'] : '';
+            $dsn .= ' port='.$this->cnf['port'];
+            $dsn .= ' dbname='.$this->cnf['database'];
+            $dsn .= ' user='.$this->cnf['user'];
+            $dsn .= ' password='.$this->cnf['password'];
+
+            $con = @pg_connect($dsn);
+            if ($con) {
+                $this->dbcon = $con;
+                return true;   // connection and database successfully opened
+            } else if ($this->cnf['debug']){
+                msg ("PgSQL err: Connection to {$this->cnf['user']}@{$this->cnf['server']} not possible.",
+                        -1,__LINE__,__FILE__);
+            }
+            return false;  // connection failed
         }
-        return false;  // connection failed
-      }
-      return true;  // connection already open
+        return true;  // connection already open
     }
 
     /**
@@ -308,10 +317,10 @@ class auth_pgsql extends auth_mysql {
      * @author Matthias Grimm 
      */
     function _closeDB() {
-      if ($this->dbcon) {
-        pg_close ($this->dbcon);
-        $this->dbcon = 0;
-      }
+        if ($this->dbcon) {
+            pg_close ($this->dbcon);
+            $this->dbcon = 0;
+        }
     }
 
     /**
@@ -327,17 +336,17 @@ class auth_pgsql extends auth_mysql {
      * @author Matthias Grimm 
      */
     function _queryDB($query) {
-      if ($this->dbcon) {
-        $result = @pg_query($this->dbcon,$query);
-        if ($result) {
-          while (($t = pg_fetch_assoc($result)) !== false)
-            $resultarray[]=$t;
-          pg_free_result ($result);
-          return $resultarray;
-        }elseif ($this->cnf['debug'])
-          msg('PgSQL err: '.pg_last_error($this->dbcon),-1,__LINE__,__FILE__);
-      }
-      return false;
+        if ($this->dbcon) {
+            $result = @pg_query($this->dbcon,$query);
+            if ($result) {
+                while (($t = pg_fetch_assoc($result)) !== false)
+                    $resultarray[]=$t;
+                pg_free_result ($result);
+                return $resultarray;
+            }elseif ($this->cnf['debug'])
+            msg('PgSQL err: '.pg_last_error($this->dbcon),-1,__LINE__,__FILE__);
+        }
+        return false;
     }
 
     /**
@@ -347,17 +356,17 @@ class auth_pgsql extends auth_mysql {
      * @author Andreas Gohr
      */
     function _modifyDB($query) {
-      if ($this->dbcon) {
-        $result = @pg_query($this->dbcon,$query);
-        if ($result) {
-          pg_free_result ($result);
-          return true;
-        }
-        if ($this->cnf['debug']){
-          msg('PgSQL err: '.pg_last_error($this->dbcon),-1,__LINE__,__FILE__);
+        if ($this->dbcon) {
+            $result = @pg_query($this->dbcon,$query);
+            if ($result) {
+                pg_free_result ($result);
+                return true;
+            }
+            if ($this->cnf['debug']){
+                msg('PgSQL err: '.pg_last_error($this->dbcon),-1,__LINE__,__FILE__);
+            }
         }
-      }
-      return false;
+        return false;
     }
 
     /**
@@ -367,11 +376,11 @@ class auth_pgsql extends auth_mysql {
      * @author Matthias Grimm 
      */
     function _lockTables($mode) {
-      if ($this->dbcon) {
-        $this->_modifyDB('BEGIN');
-        return true;
-      }
-      return false;
+        if ($this->dbcon) {
+            $this->_modifyDB('BEGIN');
+            return true;
+        }
+        return false;
     }
 
     /**
@@ -380,11 +389,11 @@ class auth_pgsql extends auth_mysql {
      * @author Matthias Grimm 
      */
     function _unlockTables() {
-      if ($this->dbcon) {
-        $this->_modifyDB('COMMIT');
-        return true;
-      }
-      return false;
+        if ($this->dbcon) {
+            $this->_modifyDB('COMMIT');
+            return true;
+        }
+        return false;
     }
 
     // @inherit function _createSQLFilter($sql, $filter)
@@ -398,11 +407,11 @@ class auth_pgsql extends auth_mysql {
      * @param  boolean $like   Escape wildcard chars as well?
      */
     function _escape($string,$like=false){
-      $string = pg_escape_string($string);
-      if($like){
-        $string = addcslashes($string,'%_');
-      }
-      return $string;
+        $string = pg_escape_string($string);
+        if($like){
+            $string = addcslashes($string,'%_');
+        }
+        return $string;
     }
 
 }
diff --git a/inc/auth/plain.class.php b/inc/auth/plain.class.php
index 3941190e9..e682d2522 100644
--- a/inc/auth/plain.class.php
+++ b/inc/auth/plain.class.php
@@ -20,24 +20,24 @@ class auth_plain extends auth_basic {
      *
      * @author  Christopher Smith 
      */
-    function auth_plain() {
-      global $config_cascade;
-
-      if (!@is_readable($config_cascade['plainauth.users']['default'])){
-        $this->success = false;
-      }else{
-        if(@is_writable($config_cascade['plainauth.users']['default'])){
-          $this->cando['addUser']      = true;
-          $this->cando['delUser']      = true;
-          $this->cando['modLogin']     = true;
-          $this->cando['modPass']      = true;
-          $this->cando['modName']      = true;
-          $this->cando['modMail']      = true;
-          $this->cando['modGroups']    = true;
+    function __construct() {
+        global $config_cascade;
+
+        if (!@is_readable($config_cascade['plainauth.users']['default'])){
+            $this->success = false;
+        }else{
+            if(@is_writable($config_cascade['plainauth.users']['default'])){
+                $this->cando['addUser']      = true;
+                $this->cando['delUser']      = true;
+                $this->cando['modLogin']     = true;
+                $this->cando['modPass']      = true;
+                $this->cando['modName']      = true;
+                $this->cando['modMail']      = true;
+                $this->cando['modGroups']    = true;
+            }
+            $this->cando['getUsers']     = true;
+            $this->cando['getUserCount'] = true;
         }
-        $this->cando['getUsers']     = true;
-        $this->cando['getUserCount'] = true;
-      }
     }
 
     /**
@@ -51,10 +51,10 @@ class auth_plain extends auth_basic {
      */
     function checkPass($user,$pass){
 
-      $userinfo = $this->getUserData($user);
-      if ($userinfo === false) return false;
+        $userinfo = $this->getUserData($user);
+        if ($userinfo === false) return false;
 
-      return auth_verifyPassword($pass,$this->users[$user]['pass']);
+        return auth_verifyPassword($pass,$this->users[$user]['pass']);
     }
 
     /**
@@ -71,8 +71,8 @@ class auth_plain extends auth_basic {
      */
     function getUserData($user){
 
-      if($this->users === null) $this->_loadUserData();
-      return isset($this->users[$user]) ? $this->users[$user] : false;
+        if($this->users === null) $this->_loadUserData();
+        return isset($this->users[$user]) ? $this->users[$user] : false;
     }
 
     /**
@@ -88,29 +88,29 @@ class auth_plain extends auth_basic {
      * @author  Chris Smith 
      */
     function createUser($user,$pwd,$name,$mail,$grps=null){
-      global $conf;
-      global $config_cascade;
+        global $conf;
+        global $config_cascade;
 
-      // user mustn't already exist
-      if ($this->getUserData($user) !== false) return false;
+        // user mustn't already exist
+        if ($this->getUserData($user) !== false) return false;
 
-      $pass = auth_cryptPassword($pwd);
+        $pass = auth_cryptPassword($pwd);
 
-      // set default group if no groups specified
-      if (!is_array($grps)) $grps = array($conf['defaultgroup']);
+        // set default group if no groups specified
+        if (!is_array($grps)) $grps = array($conf['defaultgroup']);
 
-      // prepare user line
-      $groups = join(',',$grps);
-      $userline = join(':',array($user,$pass,$name,$mail,$groups))."\n";
+        // prepare user line
+        $groups = join(',',$grps);
+        $userline = join(':',array($user,$pass,$name,$mail,$groups))."\n";
 
-      if (io_saveFile($config_cascade['plainauth.users']['default'],$userline,true)) {
-        $this->users[$user] = compact('pass','name','mail','grps');
-        return $pwd;
-      }
+        if (io_saveFile($config_cascade['plainauth.users']['default'],$userline,true)) {
+            $this->users[$user] = compact('pass','name','mail','grps');
+            return $pwd;
+        }
 
-      msg('The '.$config_cascade['plainauth.users']['default'].
-          ' file is not writable. Please inform the Wiki-Admin',-1);
-      return null;
+        msg('The '.$config_cascade['plainauth.users']['default'].
+                ' file is not writable. Please inform the Wiki-Admin',-1);
+        return null;
     }
 
     /**
@@ -122,78 +122,78 @@ class auth_plain extends auth_basic {
      * @return  bool
      */
     function modifyUser($user, $changes) {
-      global $conf;
-      global $ACT;
-      global $INFO;
-      global $config_cascade;
-
-      // sanity checks, user must already exist and there must be something to change
-      if (($userinfo = $this->getUserData($user)) === false) return false;
-      if (!is_array($changes) || !count($changes)) return true;
-
-      // update userinfo with new data, remembering to encrypt any password
-      $newuser = $user;
-      foreach ($changes as $field => $value) {
-        if ($field == 'user') {
-          $newuser = $value;
-          continue;
+        global $conf;
+        global $ACT;
+        global $INFO;
+        global $config_cascade;
+
+        // sanity checks, user must already exist and there must be something to change
+        if (($userinfo = $this->getUserData($user)) === false) return false;
+        if (!is_array($changes) || !count($changes)) return true;
+
+        // update userinfo with new data, remembering to encrypt any password
+        $newuser = $user;
+        foreach ($changes as $field => $value) {
+            if ($field == 'user') {
+                $newuser = $value;
+                continue;
+            }
+            if ($field == 'pass') $value = auth_cryptPassword($value);
+            $userinfo[$field] = $value;
+        }
+
+        $groups = join(',',$userinfo['grps']);
+        $userline = join(':',array($newuser, $userinfo['pass'], $userinfo['name'], $userinfo['mail'], $groups))."\n";
+
+        if (!$this->deleteUsers(array($user))) {
+            msg('Unable to modify user data. Please inform the Wiki-Admin',-1);
+            return false;
+        }
+
+        if (!io_saveFile($config_cascade['plainauth.users']['default'],$userline,true)) {
+            msg('There was an error modifying your user data. You should register again.',-1);
+            // FIXME, user has been deleted but not recreated, should force a logout and redirect to login page
+            $ACT == 'register';
+            return false;
         }
-        if ($field == 'pass') $value = auth_cryptPassword($value);
-        $userinfo[$field] = $value;
-      }
-
-      $groups = join(',',$userinfo['grps']);
-      $userline = join(':',array($newuser, $userinfo['pass'], $userinfo['name'], $userinfo['mail'], $groups))."\n";
-
-      if (!$this->deleteUsers(array($user))) {
-        msg('Unable to modify user data. Please inform the Wiki-Admin',-1);
-        return false;
-      }
-
-      if (!io_saveFile($config_cascade['plainauth.users']['default'],$userline,true)) {
-        msg('There was an error modifying your user data. You should register again.',-1);
-        // FIXME, user has been deleted but not recreated, should force a logout and redirect to login page
-        $ACT == 'register';
-        return false;
-      }
-
-      $this->users[$newuser] = $userinfo;
-      return true;
+
+        $this->users[$newuser] = $userinfo;
+        return true;
     }
 
     /**
-     *  Remove one or more users from the list of registered users
+     * Remove one or more users from the list of registered users
      *
-     *  @author  Christopher Smith 
-     *  @param   array  $users   array of users to be deleted
-     *  @return  int             the number of users deleted
+     * @author  Christopher Smith 
+     * @param   array  $users   array of users to be deleted
+     * @return  int             the number of users deleted
      */
     function deleteUsers($users) {
-      global $config_cascade;
+        global $config_cascade;
 
-      if (!is_array($users) || empty($users)) return 0;
+        if (!is_array($users) || empty($users)) return 0;
 
-      if ($this->users === null) $this->_loadUserData();
+        if ($this->users === null) $this->_loadUserData();
 
-      $deleted = array();
-      foreach ($users as $user) {
-        if (isset($this->users[$user])) $deleted[] = preg_quote($user,'/');
-      }
+        $deleted = array();
+        foreach ($users as $user) {
+            if (isset($this->users[$user])) $deleted[] = preg_quote($user,'/');
+        }
 
-      if (empty($deleted)) return 0;
+        if (empty($deleted)) return 0;
 
-      $pattern = '/^('.join('|',$deleted).'):/';
+        $pattern = '/^('.join('|',$deleted).'):/';
 
-      if (io_deleteFromFile($config_cascade['plainauth.users']['default'],$pattern,true)) {
-        foreach ($deleted as $user) unset($this->users[$user]);
-        return count($deleted);
-      }
+        if (io_deleteFromFile($config_cascade['plainauth.users']['default'],$pattern,true)) {
+            foreach ($deleted as $user) unset($this->users[$user]);
+            return count($deleted);
+        }
 
-      // problem deleting, reload the user list and count the difference
-      $count = count($this->users);
-      $this->_loadUserData();
-      $count -= count($this->users);
-      return $count;
+        // problem deleting, reload the user list and count the difference
+        $count = count($this->users);
+        $this->_loadUserData();
+        $count -= count($this->users);
+        return $count;
     }
 
     /**
@@ -203,18 +203,18 @@ class auth_plain extends auth_basic {
      */
     function getUserCount($filter=array()) {
 
-      if($this->users === null) $this->_loadUserData();
+        if($this->users === null) $this->_loadUserData();
 
-      if (!count($filter)) return count($this->users);
+        if (!count($filter)) return count($this->users);
 
-      $count = 0;
-      $this->_constructPattern($filter);
+        $count = 0;
+        $this->_constructPattern($filter);
 
-      foreach ($this->users as $user => $info) {
-          $count += $this->_filter($user, $info);
-      }
+        foreach ($this->users as $user => $info) {
+            $count += $this->_filter($user, $info);
+        }
 
-      return $count;
+        return $count;
     }
 
     /**
@@ -228,27 +228,27 @@ class auth_plain extends auth_basic {
      */
     function retrieveUsers($start=0,$limit=0,$filter=array()) {
 
-      if ($this->users === null) $this->_loadUserData();
+        if ($this->users === null) $this->_loadUserData();
 
-      ksort($this->users);
+        ksort($this->users);
 
-      $i = 0;
-      $count = 0;
-      $out = array();
-      $this->_constructPattern($filter);
+        $i = 0;
+        $count = 0;
+        $out = array();
+        $this->_constructPattern($filter);
 
-      foreach ($this->users as $user => $info) {
-        if ($this->_filter($user, $info)) {
-          if ($i >= $start) {
-            $out[$user] = $info;
-            $count++;
-            if (($limit > 0) && ($count >= $limit)) break;
-          }
-          $i++;
+        foreach ($this->users as $user => $info) {
+            if ($this->_filter($user, $info)) {
+                if ($i >= $start) {
+                    $out[$user] = $info;
+                    $count++;
+                    if (($limit > 0) && ($count >= $limit)) break;
+                }
+                $i++;
+            }
         }
-      }
 
-      return $out;
+        return $out;
     }
 
     /**
@@ -275,26 +275,26 @@ class auth_plain extends auth_basic {
      * @author  Andreas Gohr 
      */
     function _loadUserData(){
-      global $config_cascade;
+        global $config_cascade;
 
-      $this->users = array();
+        $this->users = array();
 
-      if(!@file_exists($config_cascade['plainauth.users']['default'])) return;
+        if(!@file_exists($config_cascade['plainauth.users']['default'])) return;
 
-      $lines = file($config_cascade['plainauth.users']['default']);
-      foreach($lines as $line){
-        $line = preg_replace('/#.*$/','',$line); //ignore comments
-        $line = trim($line);
-        if(empty($line)) continue;
+        $lines = file($config_cascade['plainauth.users']['default']);
+        foreach($lines as $line){
+            $line = preg_replace('/#.*$/','',$line); //ignore comments
+            $line = trim($line);
+            if(empty($line)) continue;
 
-        $row    = explode(":",$line,5);
-        $groups = array_values(array_filter(explode(",",$row[4])));
+            $row    = explode(":",$line,5);
+            $groups = array_values(array_filter(explode(",",$row[4])));
 
-        $this->users[$row[0]]['pass'] = $row[1];
-        $this->users[$row[0]]['name'] = urldecode($row[2]);
-        $this->users[$row[0]]['mail'] = $row[3];
-        $this->users[$row[0]]['grps'] = $groups;
-      }
+            $this->users[$row[0]]['pass'] = $row[1];
+            $this->users[$row[0]]['name'] = urldecode($row[2]);
+            $this->users[$row[0]]['mail'] = $row[3];
+            $this->users[$row[0]]['grps'] = $groups;
+        }
     }
 
     /**
@@ -317,11 +317,11 @@ class auth_plain extends auth_basic {
     }
 
     function _constructPattern($filter) {
-      $this->_pattern = array();
-      foreach ($filter as $item => $pattern) {
-//        $this->_pattern[$item] = '/'.preg_quote($pattern,"/").'/i';          // don't allow regex characters
-        $this->_pattern[$item] = '/'.str_replace('/','\/',$pattern).'/i';    // allow regex characters
-      }
+        $this->_pattern = array();
+        foreach ($filter as $item => $pattern) {
+            //        $this->_pattern[$item] = '/'.preg_quote($pattern,"/").'/i';          // don't allow regex characters
+            $this->_pattern[$item] = '/'.str_replace('/','\/',$pattern).'/i';    // allow regex characters
+        }
     }
 }
 
diff --git a/inc/cliopts.php b/inc/cliopts.php
index 588f0bc6d..9cea686a2 100644
--- a/inc/cliopts.php
+++ b/inc/cliopts.php
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1997-2004 The PHP Group
  *
-  * LICENSE: This source file is subject to the New BSD license that is
+ * LICENSE: This source file is subject to the New BSD license that is
  * available through the world-wide-web at the following URI:
  * http://www.opensource.org/licenses/bsd-license.php. If you did not receive
  * a copy of the New BSD License and are unable to obtain it through the web,
@@ -297,9 +297,8 @@ class Doku_Cli_Opts {
      * @access private
      * @return bool
      */
-    function _isShortOpt($arg)
-    {
-        return strlen($arg) == 2 && $arg[0] == '-' 
+    function _isShortOpt($arg){
+        return strlen($arg) == 2 && $arg[0] == '-'
                && preg_match('/[a-zA-Z]/', $arg[1]);
     }
 
@@ -311,8 +310,7 @@ class Doku_Cli_Opts {
      * @access private
      * @return bool
      */
-    function _isLongOpt($arg)
-    {
+    function _isLongOpt($arg){
         return strlen($arg) > 2 && $arg[0] == '-' && $arg[1] == '-' &&
                preg_match('/[a-zA-Z]+$/', substr($arg, 2));
     }
diff --git a/inc/common.php b/inc/common.php
index 0c769c50d..0a75f2eab 100644
--- a/inc/common.php
+++ b/inc/common.php
@@ -1290,14 +1290,14 @@ function dformat($dt=null,$format=''){
  *
  * @author 
  * @link http://www.php.net/manual/en/function.date.php#54072
+ * @param int $int_date: current date in UNIX timestamp
  */
 function date_iso8601($int_date) {
-   //$int_date: current date in UNIX timestamp
-   $date_mod = date('Y-m-d\TH:i:s', $int_date);
-   $pre_timezone = date('O', $int_date);
-   $time_zone = substr($pre_timezone, 0, 3).":".substr($pre_timezone, 3, 2);
-   $date_mod .= $time_zone;
-   return $date_mod;
+    $date_mod = date('Y-m-d\TH:i:s', $int_date);
+    $pre_timezone = date('O', $int_date);
+    $time_zone = substr($pre_timezone, 0, 3).":".substr($pre_timezone, 3, 2);
+    $date_mod .= $time_zone;
+    return $date_mod;
 }
 
 /**
@@ -1558,10 +1558,14 @@ function valid_input_set($param, $valid_values, $array, $exc = '') {
     }
 }
 
+/**
+ * Read a preference from the DokuWiki cookie
+ */
 function get_doku_pref($pref, $default) {
     if (strpos($_COOKIE['DOKU_PREFS'], $pref) !== false) {
         $parts = explode('#', $_COOKIE['DOKU_PREFS']);
-        for ($i = 0; $i < count($parts); $i+=2){
+        $cnt   = count($parts);
+        for ($i = 0; $i < $cnt; $i+=2){
             if ($parts[$i] == $pref) {
                 return $parts[$i+1];
             }
diff --git a/inc/config_cascade.php b/inc/config_cascade.php
index 443114f52..79567fc56 100644
--- a/inc/config_cascade.php
+++ b/inc/config_cascade.php
@@ -64,7 +64,7 @@ $config_cascade = array_merge(
         'plainauth.users' => array(
             'default' => DOKU_CONF.'users.auth.php',
             ),
-        
+
         'plugins' => array(
             'local'     => array(DOKU_CONF.'plugins.local.php'),
             'protected' => array(
diff --git a/inc/html.php b/inc/html.php
index ef95aa11f..b233e1d92 100644
--- a/inc/html.php
+++ b/inc/html.php
@@ -1141,8 +1141,6 @@ function html_diff($text='',$intro=true,$type=null){
         $tdf = new TableDiffFormatter();
     }
 
-
-
     if($intro) print p_locale_xhtml('diff');
 
     if (!$text) {
@@ -1165,7 +1163,6 @@ function html_diff($text='',$intro=true,$type=null){
         $form->addElement(form_makeButton('submit', 'diff','Go'));
         $form->printForm();
 
-
         $diffurl = wl($ID, array(
                         'do'       => 'diff',
                         'rev2[0]'  => $l_rev,
@@ -1703,8 +1700,6 @@ function html_resendpwd() {
         html_form('resendpwd', $form);
         print '
    '.NL;
     }
-
-
 }
 
 /**
diff --git a/inc/indexer.php b/inc/indexer.php
index 6766bec25..80d2651c2 100644
--- a/inc/indexer.php
+++ b/inc/indexer.php
@@ -291,7 +291,6 @@ class Doku_Indexer {
                 $val_idx = array();
             }
 
-
             foreach ($values as $val) {
                 $val = (string)$val;
                 if ($val !== "") {
diff --git a/inc/mail.php b/inc/mail.php
index 01b2895e1..bec0c5b10 100644
--- a/inc/mail.php
+++ b/inc/mail.php
@@ -106,7 +106,7 @@ function _mail_send_action($data) {
 
     // discard mail request if no recipients are available
     if(trim($to) === '' && trim($cc) === '' && trim($bcc) === '') return false;
-    
+
     // end additional code to support event ... original mail_send() code from here
 
     if(defined('MAILHEADER_ASCIIONLY')){
@@ -208,9 +208,9 @@ function mail_encode_address($string,$header='',$names=true){
             if(!utf8_isASCII($text)){
                 // put the quotes outside as in =?UTF-8?Q?"Elan Ruusam=C3=A4e"?= vs "=?UTF-8?Q?Elan Ruusam=C3=A4e?="
                 if (preg_match('/^"(.+)"$/', $text, $matches)) {
-                  $text = '"=?UTF-8?Q?'.mail_quotedprintable_encode($matches[1], 0).'?="';
+                    $text = '"=?UTF-8?Q?'.mail_quotedprintable_encode($matches[1], 0).'?="';
                 } else {
-                  $text = '=?UTF-8?Q?'.mail_quotedprintable_encode($text, 0).'?=';
+                    $text = '=?UTF-8?Q?'.mail_quotedprintable_encode($text, 0).'?=';
                 }
                 // additionally the space character should be encoded as =20 (or each
                 // word QP encoded separately).
diff --git a/inc/media.php b/inc/media.php
index 66c531452..dd0193fa0 100644
--- a/inc/media.php
+++ b/inc/media.php
@@ -175,10 +175,10 @@ define('DOKU_MEDIA_EMPTY_NS', 8);
  *
  * @author Andreas Gohr 
  * @return int One of: 0,
-                       DOKU_MEDIA_DELETED,
-                       DOKU_MEDIA_DELETED | DOKU_MEDIA_EMPTY_NS,
-                       DOKU_MEDIA_NOT_AUTH,
-                       DOKU_MEDIA_INUSE
+ *                     DOKU_MEDIA_DELETED,
+ *                     DOKU_MEDIA_DELETED | DOKU_MEDIA_EMPTY_NS,
+ *                     DOKU_MEDIA_NOT_AUTH,
+ *                     DOKU_MEDIA_INUSE
  */
 function media_delete($id,$auth){
     global $lang;
diff --git a/inc/pageutils.php b/inc/pageutils.php
index 151fa5987..db00258e2 100644
--- a/inc/pageutils.php
+++ b/inc/pageutils.php
@@ -213,9 +213,9 @@ function sectionID($title,&$check) {
     if(is_array($check)){
         // make sure tiles are unique
         if (!array_key_exists ($title,$check)) {
-           $check[$title] = 0;
+            $check[$title] = 0;
         } else {
-           $title .= ++ $check[$title];
+            $title .= ++ $check[$title];
         }
     }
 
@@ -347,8 +347,8 @@ function mediaFN($id, $rev=''){
     if(empty($rev)){
         $fn = $conf['mediadir'].'/'.utf8_encodeFN($id);
     }else{
-    	$ext = mimetype($id);
-    	$name = substr($id,0, -1*strlen($ext[0])-1);
+        $ext = mimetype($id);
+        $name = substr($id,0, -1*strlen($ext[0])-1);
         $fn = $conf['mediaolddir'].'/'.utf8_encodeFN($name .'.'.( (int) $rev ).'.'.$ext[0]);
     }
     return $fn;
diff --git a/inc/plugincontroller.class.php b/inc/plugincontroller.class.php
index 734331c94..208d7dae9 100644
--- a/inc/plugincontroller.class.php
+++ b/inc/plugincontroller.class.php
@@ -137,6 +137,7 @@ class Doku_Plugin_Controller {
                     // the plugin was disabled by rc2009-01-26
                     // disabling mechanism was changed back very soon again
                     // to keep everything simple we just skip the plugin completely
+                    continue;
                 } elseif (@file_exists(DOKU_PLUGIN.$plugin.'/disabled')) {
                     // treat this as a default disabled plugin(over-rideable by the plugin manager)
                     // deprecated 2011-09-10 (usage of disabled files)
diff --git a/inc/template.php b/inc/template.php
index 5733972f7..8ca6defeb 100644
--- a/inc/template.php
+++ b/inc/template.php
@@ -994,7 +994,7 @@ function tpl_img($maxwidth=0,$maxheight=0,$link=true,$params=null){
 /**
  * Default action for TPL_IMG_DISPLAY
  */
-function _tpl_img_action($data, $param=NULL) {
+function _tpl_img_action($data, $param=null) {
     global $lang;
     $p = buildAttributes($data['params']);
 
diff --git a/inc/utf8.php b/inc/utf8.php
index 9d0d17f78..54986e14e 100644
--- a/inc/utf8.php
+++ b/inc/utf8.php
@@ -526,7 +526,7 @@ if(!function_exists('utf8_decode_numeric')){
 if(!class_exists('utf8_entity_decoder')){
     class utf8_entity_decoder {
         var $table;
-        function utf8_entity_decoder() {
+        function __construct() {
             $table = get_html_translation_table(HTML_ENTITIES);
             $table = array_flip($table);
             $this->table = array_map(array(&$this,'makeutf8'), $table);
-- 
cgit v1.2.3


From 053d9e5dfd8af184722ff762028c824de4c7858c Mon Sep 17 00:00:00 2001
From: Tim Roes 
Date: Sun, 18 Mar 2012 14:43:27 +0100
Subject: Fixed call to new constructor name

---
 inc/HTTPClient.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/inc/HTTPClient.php b/inc/HTTPClient.php
index 62c3fde2f..26bee52a7 100644
--- a/inc/HTTPClient.php
+++ b/inc/HTTPClient.php
@@ -26,7 +26,7 @@ class DokuHTTPClient extends HTTPClient {
         global $conf;
 
         // call parent constructor
-        $this->HTTPClient();
+        parent::__construct();
 
         // set some values from the config
         $this->proxy_host   = $conf['proxy']['host'];
-- 
cgit v1.2.3


From 4ea1d54936a1d1e9b919e06639632bc2ac65f6d3 Mon Sep 17 00:00:00 2001
From: Dominik Eckelmann 
Date: Wed, 21 Mar 2012 11:01:38 +0100
Subject: typo fixes

---
 inc/remote.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/inc/remote.php b/inc/remote.php
index c8af76420..fb095f517 100644
--- a/inc/remote.php
+++ b/inc/remote.php
@@ -92,7 +92,7 @@ class RemoteAPI {
         $plugin = plugin_load('remote', $pluginName);
         $methods = $this->getPluginMethods();
         if (!$plugin) {
-            throw new RemoteException('Method dose not exists', -32603);
+            throw new RemoteException('Method does not exist', -32603);
         }
         $this->checkAccess($methods[$method]);
         $name = $this->getMethodName($methods, $method);
@@ -103,7 +103,7 @@ class RemoteAPI {
         $coreMethods = $this->getCoreMethods();
         $this->checkAccess($coreMethods[$method]);
         if (!isset($coreMethods[$method])) {
-            throw new RemoteException('Method dose not exists', -32603);
+            throw new RemoteException('Method does not exist', -32603);
         }
         $this->checkArgumentLength($coreMethods[$method], $args);
         return call_user_func_array(array($this->coreMethods, $this->getMethodName($coreMethods, $method)), $args);
@@ -121,7 +121,7 @@ class RemoteAPI {
 
     private function checkArgumentLength($method, $args) {
         if (count($method['args']) < count($args)) {
-            throw new RemoteException('Method dose not exists - wrong parameter count.', -32603);
+            throw new RemoteException('Method does not exist - wrong parameter count.', -32603);
         }
     }
 
@@ -173,7 +173,7 @@ class RemoteAPI {
             foreach ($plugins as $pluginName) {
                 $plugin = plugin_load('remote', $pluginName);
                 if (!is_subclass_of($plugin, 'DokuWiki_Remote_Plugin')) {
-                    throw new RemoteException("Plugin $pluginName dose not implement DokuWiki_Remote_Plugin");
+                    throw new RemoteException("Plugin $pluginName does not implement DokuWiki_Remote_Plugin");
                 }
 
                 $methods = $plugin->_getMethods();
-- 
cgit v1.2.3


From c2eb026d070a5ba9ba1ee8754c3a862a026a7ea8 Mon Sep 17 00:00:00 2001
From: Dominik Eckelmann 
Date: Wed, 21 Mar 2012 11:04:12 +0100
Subject: changed error code for unauthorized method calls.

---
 inc/remote.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/inc/remote.php b/inc/remote.php
index fb095f517..b4cc8e6cc 100644
--- a/inc/remote.php
+++ b/inc/remote.php
@@ -158,7 +158,7 @@ class RemoteAPI {
      */
     public function forceAccess() {
         if (!$this->hasAccess()) {
-            throw new RemoteAccessDeniedException('server error. not authorized to call method', -32603);
+            throw new RemoteAccessDeniedException('server error. not authorized to call method', -32604);
         }
     }
 
-- 
cgit v1.2.3


From 96946cc94d3ecb3832e2a1ce35c49743e25329e1 Mon Sep 17 00:00:00 2001
From: Dominik Eckelmann 
Date: Wed, 21 Mar 2012 11:25:00 +0100
Subject: replaced $HTTP_RAW_POST_DATA with http_get_raw_post_data function

---
 inc/IXR_Library.php      |  7 ++++---
 inc/httputils.php        |  8 ++++++++
 lib/exe/xmlrpc.php       |  3 ---
 lib/plugins/acl/ajax.php | 11 ++++++-----
 4 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/inc/IXR_Library.php b/inc/IXR_Library.php
index c8255e6d9..ce5a4d914 100644
--- a/inc/IXR_Library.php
+++ b/inc/IXR_Library.php
@@ -302,11 +302,12 @@ class IXR_Server {
     }
     function serve($data = false) {
         if (!$data) {
-            global $HTTP_RAW_POST_DATA;
-            if (!$HTTP_RAW_POST_DATA) {
+
+            $postData = trim(http_get_raw_post_data());
+            if (!$postData) {
                 die('XML-RPC server accepts POST requests only.');
             }
-            $data = $HTTP_RAW_POST_DATA;
+            $data = $postData;
         }
         $this->message = new IXR_Message($data);
         if (!$this->message->parse()) {
diff --git a/inc/httputils.php b/inc/httputils.php
index 0ad97a9a1..b815f3ca6 100644
--- a/inc/httputils.php
+++ b/inc/httputils.php
@@ -249,3 +249,11 @@ function http_cached_finish($file, $content) {
         print $content;
     }
 }
+
+function http_get_raw_post_data() {
+    static $postData = null;
+    if ($postData === null) {
+        $postData = file_get_contents('php://input');
+    }
+    return $postData;
+}
diff --git a/lib/exe/xmlrpc.php b/lib/exe/xmlrpc.php
index 93086e891..cbec90bff 100644
--- a/lib/exe/xmlrpc.php
+++ b/lib/exe/xmlrpc.php
@@ -1,9 +1,6 @@
 
  */
 
-//fix for Opera XMLHttpRequests
-if(!count($_POST) && !empty($HTTP_RAW_POST_DATA)){
-  parse_str($HTTP_RAW_POST_DATA, $_POST);
-}
-
 if(!defined('DOKU_INC')) define('DOKU_INC',dirname(__FILE__).'/../../../');
 require_once(DOKU_INC.'inc/init.php');
 //close session
 session_write_close();
 
+//fix for Opera XMLHttpRequests
+$postData = http_get_raw_post_data();
+if(!count($_POST) && !empty($postData)){
+    parse_str($postData, $_POST);
+}
+
 if(!auth_isadmin()) die('for admins only');
 if(!checkSecurityToken()) die('CRSF Attack');
 
-- 
cgit v1.2.3


From 7c35ac36c1dea2d6f26d8184dcbf1fe5afae59ac Mon Sep 17 00:00:00 2001
From: Dominik Eckelmann 
Date: Wed, 21 Mar 2012 13:15:18 +0100
Subject: added RPC_CALL_ADD event.

This event enables plugins to register custom method names.
---
 _test/cases/inc/remote.test.php | 12 ++++++++++++
 inc/remote.php                  | 37 ++++++++++++++++++++++++++++++++++---
 2 files changed, 46 insertions(+), 3 deletions(-)

diff --git a/_test/cases/inc/remote.test.php b/_test/cases/inc/remote.test.php
index 186f8e65a..f03d13ce1 100644
--- a/_test/cases/inc/remote.test.php
+++ b/_test/cases/inc/remote.test.php
@@ -309,4 +309,16 @@ class remote_test extends UnitTestCase {
         $remoteApi->call('plugin.testplugin.methodString');
     }
 
+    function test_pluginCallCustomPath() {
+        global $EVENT_HANDLER;
+        $EVENT_HANDLER->register_hook('RPC_CALL_ADD', 'BEFORE', &$this, 'pluginCallCustomPathRegister');
+
+        $remoteApi = new RemoteAPI();
+        $result = $remoteApi->call('custom.path');
+        $this->assertEqual($result, 'success');
+    }
+
+    function pluginCallCustomPathRegister(&$event, $param) {
+        $event->data['custom.path'] = array('testplugin', 'methodString');
+    }
 }
diff --git a/inc/remote.php b/inc/remote.php
index b4cc8e6cc..089a5f7d4 100644
--- a/inc/remote.php
+++ b/inc/remote.php
@@ -35,8 +35,6 @@ class RemoteAccessDeniedException extends RemoteException {}
  * plugin methods are formed like 'plugin..'.
  * i.e.: plugin.clock.getTime or plugin.clock_gmt.getTime
  *
- *
- *
  * @throws RemoteException
  */
 class RemoteAPI {
@@ -52,6 +50,14 @@ class RemoteAPI {
      */
     private $pluginMethods = null;
 
+    /**
+     * @var array contains custom calls to the api. Plugins can use the XML_CALL_REGISTER event.
+     * The data inside is 'custom.call.something' => array('plugin name', 'remote method name')
+     *
+     * The remote method name is the same as in the remote name returned by _getMethods().
+     */
+    private $pluginCustomCalls = null;
+
     private $dateTransformation;
     private $fileTransformation;
 
@@ -83,9 +89,34 @@ class RemoteAPI {
         list($type, $pluginName, $call) = explode('.', $method, 3);
         if ($type === 'plugin') {
             return $this->callPlugin($pluginName, $method, $args);
-        } else {
+        }
+        if ($this->coreMethodExist($method)) {
             return $this->callCoreMethod($method, $args);
         }
+        return $this->callCustomCallPlugin($method, $args);
+    }
+
+    private function coreMethodExist($name) {
+        $coreMethods = $this->getCoreMethods();
+        return array_key_exists($name, $coreMethods);
+    }
+
+    private function  callCustomCallPlugin($method, $args) {
+        $customCalls = $this->getCustomCallPlugins();
+        if (!array_key_exists($method, $customCalls)) {
+            throw new RemoteException('Method does not exist', -32603);
+        }
+        $customCall = $customCalls[$method];
+        return $this->callPlugin($customCall[0], $customCall[1], $args);
+    }
+
+    private function getCustomCallPlugins() {
+        if ($this->pluginCustomCalls === null) {
+            $data = array();
+            trigger_event('RPC_CALL_ADD', $data);
+            $this->pluginCustomCalls = $data;
+        }
+        return $this->pluginCustomCalls;
     }
 
     private function callPlugin($pluginName, $method, $args) {
-- 
cgit v1.2.3


From 895122581107d99070522a1b5121f01e69d8a4de Mon Sep 17 00:00:00 2001
From: Dominik Eckelmann 
Date: Wed, 21 Mar 2012 13:33:00 +0100
Subject: added dokuwiki.getXMLRPCAPIVersion and wiki.getRPCVersionSupported

---
 inc/RemoteAPICore.php | 99 ++++++++++++++++++---------------------------------
 1 file changed, 35 insertions(+), 64 deletions(-)

diff --git a/inc/RemoteAPICore.php b/inc/RemoteAPICore.php
index d525b17e0..38f7072ad 100644
--- a/inc/RemoteAPICore.php
+++ b/inc/RemoteAPICore.php
@@ -20,25 +20,17 @@ class RemoteAPICore {
                 'return' => 'string',
                 'doc' => 'Returns the running DokuWiki version.'
             ), 'dokuwiki.login' => array(
-                'args' => array(
-                    'username' => 'string',
-                    'password' => 'string'
-                ),
+                'args' => array('string', 'string'),
                 'return' => 'int',
                 'doc' => 'Tries to login with the given credentials and sets auth cookies.',
                 'public' => '1'
             ), 'dokuwiki.getPagelist' => array(
-                'args' => array(
-                    'namespace' => 'string',
-                    'options' => 'array'
-                ),
+                'args' => array('string', 'array'),
                 'return' => 'array',
                 'doc' => 'List all pages within the given namespace.',
                 'name' => 'readNamespace'
             ), 'dokuwiki.search' => array(
-                'args' => array(
-                    'search' => 'string'
-                ),
+                'args' => array('string'),
                 'return' => 'array',
                 'doc' => 'Perform a fulltext search and return a list of matching pages'
             ), 'dokuwiki.getTime' => array(
@@ -46,7 +38,7 @@ class RemoteAPICore {
                 'return' => 'int',
                 'doc' =>  'Returns the current time at the remote wiki server as Unix timestamp.',
             ), 'dokuwiki.setLocks' => array(
-                'args' => array('lock' => 'array'),
+                'args' => array('array'),
                 'return' => 'array',
                 'doc' => 'Lock or unlock pages.'
             ), 'dokuwiki.getTitle' => array(
@@ -54,40 +46,26 @@ class RemoteAPICore {
                 'return' => 'string',
                 'doc' => 'Returns the wiki title.'
             ), 'dokuwiki.appendPage' => array(
-                'args' => array(
-                    'pagename' => 'string',
-                    'rawWikiText' => 'string',
-                    'attrs' => 'array'
-                ),
+                'args' => array('string', 'string', 'array'),
                 'return' => 'int',
                 'doc' => 'Append text to a wiki page.'
             ),  'wiki.getPage' => array(
-                'args' => array(
-                    'id' => 'string'
-                ),
+                'args' => array('string'),
                 'return' => 'string',
                 'doc' => 'Get the raw Wiki text of page, latest version.',
                 'name' => 'rawPage',
             ), 'wiki.getPageVersion' => array(
-                'args' => array(
-                    'id' => 'string',
-                    'rev' => 'int',
-                ),
+                'args' => array('string', 'int'),
                 'name' => 'rawPage',
                 'return' => 'string',
                 'doc' => 'Return a raw wiki page'
             ), 'wiki.getPageHTML' => array(
-                'args' => array(
-                    'id' => 'string'
-                ),
+                'args' => array('string'),
                 'return' => 'string',
                 'doc' => 'Return page in rendered HTML, latest version.',
                 'name' => 'htmlPage'
             ), 'wiki.getPageHTMLVersion' => array(
-                'args' => array(
-                    'id' => 'string',
-                    'rev' => 'int'
-                ),
+                'args' => array('string', 'int'),
                 'return' => 'string',
                 'doc' => 'Return page in rendered HTML.',
                 'name' => 'htmlPage'
@@ -97,86 +75,79 @@ class RemoteAPICore {
                 'doc' => 'Returns a list of all pages. The result is an array of utf8 pagenames.',
                 'name' => 'listPages'
             ), 'wiki.getAttachments' => array(
-                'args' => array(
-                    'namespace' => 'string',
-                    'options' => 'array'
-                ),
+                'args' => array('string', 'array'),
                 'return' => 'array',
                 'doc' => 'Returns a list of all media files.',
                 'name' => 'listAttachments'
             ), 'wiki.getBackLinks' => array(
-                'args' => array(
-                    'id' => 'string'
-                ),
+                'args' => array('string'),
                 'return' => 'array',
                 'doc' => 'Returns the pages that link to this page.',
                 'name' => 'listBackLinks'
             ), 'wiki.getPageInfo' => array(
-                'args' => array('id' => 'string'),
+                'args' => array('string'),
                 'return' => 'array',
                 'doc' => 'Returns a struct with infos about the page.',
                 'name' => 'pageInfo'
             ), 'wiki.getPageInfoVersion' => array(
-                'args' => array(
-                    'id' => 'string',
-                    'version' => 'int',
-                ),
+                'args' => array('string', 'int'),
                 'return' => 'array',
                 'doc' => 'Returns a struct with infos about the page.',
                 'name' => 'pageInfo'
             ), 'wiki.getPageVersions' => array(
-                'args' => array(
-                    'id' => 'string',
-                    'offset' => 'int'
-                ),
+                'args' => array('string', 'int'),
                 'return' => 'array',
                 'doc' => 'Returns the available revisions of the page.',
                 'name' => 'pageVersions'
             ), 'wiki.putPage' => array(
-                'args' => array(
-                    'id' => 'string',
-                    'rawText' => 'string',
-                    'attrs' => 'array'
-                ),
+                'args' => array('string', 'string', 'array'),
                 'return' => 'int',
                 'doc' => 'Saves a wiki page.'
             ), 'wiki.listLinks' => array(
-                'args' => array('id' => 'string'),
+                'args' => array('string'),
                 'return' => 'array',
                 'doc' => 'Lists all links contained in a wiki page.'
             ), 'wiki.getRecentChanges' => array(
-                'args' => array('timestamp' => 'int'),
+                'args' => array('int'),
                 'return' => 'array',
                 'Returns a struct about all recent changes since given timestamp.'
             ), 'wiki.getRecentMediaChanges' => array(
-                'args' => array('timestamp' => 'int'),
+                'args' => array('int'),
                 'return' => 'array',
                 'Returns a struct about all recent media changes since given timestamp.'
             ), 'wiki.aclCheck' => array(
-                'args' => array('id' => 'string'),
+                'args' => array('string'),
                 'return' => 'int',
                 'doc' => 'Returns the permissions of a given wiki page.'
             ), 'wiki.putAttachment' => array(
-                'args' => array(
-                    'id' => 'string',
-                    'data' => 'file',
-                    'params' => 'array'
-                ),
+                'args' => array('string', 'file', 'array'),
                 'return' => 'array',
                 'doc' => 'Upload a file to the wiki.'
             ), 'wiki.deleteAttachment' => array(
-                'args' => array('id' => 'string'),
+                'args' => array('string'),
                 'return' => 'int',
                 'doc' => 'Delete a file from the wiki.'
             ), 'wiki.getAttachment' => array(
-                'args' => array('id' => 'string'),
+                'args' => array('string'),
                 'doc' => 'Return a media file',
                 'return' => 'file',
                 'name' => 'getAttachment',
             ), 'wiki.getAttachmentInfo' => array(
-                'args' => array('id' => 'string'),
+                'args' => array('string'),
                 'return' => 'array',
                 'doc' => 'Returns a struct with infos about the attachment.'
+            ), 'dokuwiki.getXMLRPCAPIVersion' => array(
+                'args' => array(),
+                'name' => 'getAPIVersion',
+                'return' => 'int',
+                'doc' => 'Returns the XMLRPC API version.',
+                'public' => '1',
+            ), 'wiki.getRPCVersionSupported' => array(
+                'args' => array(),
+                'name' => 'wiki_RPCVersion',
+                'return' => 'int',
+                'doc' => 'Returns 2 with the supported RPC API version.',
+                'public' => '1'
             ),
 
         );
-- 
cgit v1.2.3


From 418431a22a4a8f9d62e60e1d8eaa9bcf321377ce Mon Sep 17 00:00:00 2001
From: Dominik Eckelmann 
Date: Wed, 21 Mar 2012 13:34:19 +0100
Subject: updated comment

---
 inc/remote.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/inc/remote.php b/inc/remote.php
index 089a5f7d4..0347bd900 100644
--- a/inc/remote.php
+++ b/inc/remote.php
@@ -19,7 +19,7 @@ class RemoteAccessDeniedException extends RemoteException {}
  * array(
  *     'method.remoteName' => array(
  *          'args' => array(
- *              'name' => 'type eg. string|int|...|date|file',
+ *              'type eg. string|int|...|date|file',
  *          )
  *          'name' => 'method name in class',
  *          'return' => 'type',
-- 
cgit v1.2.3


From 37e579189fae39899d3856598affa31dfd39328b Mon Sep 17 00:00:00 2001
From: Dominik Eckelmann 
Date: Thu, 22 Mar 2012 12:04:56 +0100
Subject: removed require_once for autoloaded fulltext.php

---
 inc/RemoteAPICore.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/inc/RemoteAPICore.php b/inc/RemoteAPICore.php
index 38f7072ad..450c6f39e 100644
--- a/inc/RemoteAPICore.php
+++ b/inc/RemoteAPICore.php
@@ -278,8 +278,6 @@ class RemoteAPICore {
      * List all pages in the given namespace (and below)
      */
     function search($query){
-        require_once(DOKU_INC.'inc/fulltext.php');
-
         $regex = '';
         $data  = ft_pageSearch($query,$regex);
         $pages = array();
-- 
cgit v1.2.3


From b967e5fc8fd93226eba7926c13b73b93878f182b Mon Sep 17 00:00:00 2001
From: Dominik Eckelmann 
Date: Thu, 22 Mar 2012 12:11:31 +0100
Subject: removed requires, changed conf check in xmlrpc.php

---
 inc/load.php       | 1 +
 inc/remote.php     | 1 -
 lib/exe/xmlrpc.php | 3 +--
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/inc/load.php b/inc/load.php
index 3f1f3429f..f3ab5bcdd 100644
--- a/inc/load.php
+++ b/inc/load.php
@@ -77,6 +77,7 @@ function load_autoload($name){
         'Sitemapper'            => DOKU_INC.'inc/Sitemapper.php',
         'PassHash'              => DOKU_INC.'inc/PassHash.class.php',
         'RemoteAPI'             => DOKU_INC.'inc/remote.php',
+        'RemoteAPICore'         => DOKU_INC.'inc/RemoteAPICore.php', 
 
         'DokuWiki_Action_Plugin' => DOKU_PLUGIN.'action.php',
         'DokuWiki_Admin_Plugin'  => DOKU_PLUGIN.'admin.php',
diff --git a/inc/remote.php b/inc/remote.php
index 0347bd900..2ef28afd2 100644
--- a/inc/remote.php
+++ b/inc/remote.php
@@ -1,7 +1,6 @@
 
Date: Fri, 23 Mar 2012 08:16:38 +0100
Subject: use correct call to parent constructor in IXR lib

---
 inc/IXR_Library.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/inc/IXR_Library.php b/inc/IXR_Library.php
index c8255e6d9..80b534b2e 100644
--- a/inc/IXR_Library.php
+++ b/inc/IXR_Library.php
@@ -501,7 +501,7 @@ class IXR_Client extends DokuHTTPClient {
     var $xmlerror = false;
 
     function IXR_Client($server, $path = false, $port = 80) {
-        $this->DokuHTTPClient();
+        parent::__construct();
         if (!$path) {
             // Assume we have been given a URL instead
             $this->posturl = $server;
-- 
cgit v1.2.3


From f914ba96dd52d197d1dbdf3dca68bf7dfc3b8380 Mon Sep 17 00:00:00 2001
From: Andreas Gohr 
Date: Fri, 23 Mar 2012 10:07:03 +0100
Subject: more verbose remote API config setting explanation

---
 lib/plugins/config/lang/en/lang.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/plugins/config/lang/en/lang.php b/lib/plugins/config/lang/en/lang.php
index fe9e5458b..2151d7543 100644
--- a/lib/plugins/config/lang/en/lang.php
+++ b/lib/plugins/config/lang/en/lang.php
@@ -110,8 +110,8 @@ $lang['disableactions_other'] = 'Other actions (comma separated)';
 $lang['sneaky_index'] = 'By default, DokuWiki will show all namespaces in the index view. Enabling this option will hide those where the user doesn\'t have read permissions. This might result in hiding of accessable subnamespaces. This may make the index unusable with certain ACL setups.';
 $lang['auth_security_timeout'] = 'Authentication Security Timeout (seconds)';
 $lang['securecookie'] = 'Should cookies set via HTTPS only be sent via HTTPS by the browser? Disable this option when only the login of your wiki is secured with SSL but browsing the wiki is done unsecured.';
-$lang['remote']      = 'Enable/disable Remote interface.';
-$lang['remoteuser']  = 'Restrict Remote access to the comma separated groups or users given here. Leave empty to give access to everyone.';
+$lang['remote']      = 'Enable the remote API system. This allows other applications to access the wiki via XML-RPC or other mechanisms.';
+$lang['remoteuser']  = 'Restrict remote API access to the comma separated groups or users given here. Leave empty to give access to everyone.';
 
 /* Advanced Options */
 $lang['updatecheck'] = 'Check for updates and security warnings? DokuWiki needs to contact update.dokuwiki.org for this feature.';
-- 
cgit v1.2.3


From 8ae0948568a6c6944e475c0d6133776d0256940f Mon Sep 17 00:00:00 2001
From: Andreas Gohr 
Date: Fri, 23 Mar 2012 10:48:38 +0100
Subject: fix for putAttachment

---
 inc/RemoteAPICore.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/inc/RemoteAPICore.php b/inc/RemoteAPICore.php
index 450c6f39e..d8d4d5b7b 100644
--- a/inc/RemoteAPICore.php
+++ b/inc/RemoteAPICore.php
@@ -471,7 +471,7 @@ class RemoteAPICore {
 
         // save temporary file
         @unlink($ftmp);
-        io_saveFile($ftmp, $file->getValue());
+        io_saveFile($ftmp, $file);
 
         $res = media_save(array('name' => $ftmp), $id, $params['ow'], $auth, 'rename');
         if (is_array($res)) {
-- 
cgit v1.2.3


From ee9b1ae4b3919f79050bb3c4478203d648810645 Mon Sep 17 00:00:00 2001
From: Taisuke Shimamoto 
Date: Fri, 23 Mar 2012 11:07:23 +0100
Subject: Japanese language update

---
 inc/lang/ja/lang.php                     | 8 ++++++++
 inc/lang/ja/resetpwd.txt                 | 3 +++
 lib/plugins/acl/lang/ja/lang.php         | 1 +
 lib/plugins/config/lang/ja/lang.php      | 6 ++++++
 lib/plugins/plugin/lang/ja/lang.php      | 1 +
 lib/plugins/popularity/lang/ja/lang.php  | 1 +
 lib/plugins/revert/lang/ja/lang.php      | 1 +
 lib/plugins/usermanager/lang/ja/lang.php | 1 +
 8 files changed, 22 insertions(+)
 create mode 100644 inc/lang/ja/resetpwd.txt

diff --git a/inc/lang/ja/lang.php b/inc/lang/ja/lang.php
index 94fa71f1b..057fa5a54 100644
--- a/inc/lang/ja/lang.php
+++ b/inc/lang/ja/lang.php
@@ -7,6 +7,7 @@
  * @author Ikuo Obataya 
  * @author Daniel Dupriest 
  * @author Kazutaka Miyasaka 
+ * @author Taisuke Shimamoto 
  */
 $lang['encoding']              = 'utf-8';
 $lang['direction']             = 'ltr';
@@ -42,6 +43,7 @@ $lang['btn_backtomedia']       = 'メディアファイル選択に戻る';
 $lang['btn_subscribe']         = '変更履歴配信の登録';
 $lang['btn_profile']           = 'ユーザー情報の更新';
 $lang['btn_reset']             = 'リセット';
+$lang['btn_resendpwd']         = '新しいパスワードをセット';
 $lang['btn_draft']             = 'ドラフトを編集';
 $lang['btn_recover']           = 'ドラフトを復元';
 $lang['btn_draftdel']          = 'ドラフトを削除';
@@ -78,6 +80,7 @@ $lang['profnoempty']           = 'ユーザー名とメールアドレスを入
 $lang['profchanged']           = 'ユーザー情報は更新されました。';
 $lang['pwdforget']             = 'パスワードをお忘れですか？パスワード再発行';
 $lang['resendna']              = 'パスワードの再発行は出来ません。';
+$lang['resendpwd']             = '新しいパスワードをセット';
 $lang['resendpwdmissing']      = '全ての項目を入力して下さい。';
 $lang['resendpwdnouser']       = '入力されたユーザーが見つかりませんでした。';
 $lang['resendpwdbadauth']      = '申し訳ありません。この確認コードは有効ではありません。メール内に記載されたリンクを確認してください。';
@@ -183,6 +186,11 @@ $lang['external_edit']         = '外部編集';
 $lang['summary']               = '編集の概要';
 $lang['noflash']               = 'この内容を表示するためには Adobe Flash Plugin が必要です。';
 $lang['download']              = 'この部分をダウンロード';
+$lang['tools']                 = 'ツール';
+$lang['user_tools']            = 'ユーザ用ツール';
+$lang['site_tools']            = 'サイト用ツール';
+$lang['page_tools']            = 'ページ用ツール';
+$lang['skip_to_content']       = '内容へ移動';
 $lang['mail_newpage']          = '文書の追加：';
 $lang['mail_changed']          = '文書の変更：';
 $lang['mail_subscribe_list']   = '名前空間内でページが変更：';
diff --git a/inc/lang/ja/resetpwd.txt b/inc/lang/ja/resetpwd.txt
new file mode 100644
index 000000000..a414af991
--- /dev/null
+++ b/inc/lang/ja/resetpwd.txt
@@ -0,0 +1,3 @@
+====== 新しいパスワードをセット ======
+
+このWikiでの、あなたのアカウント用の新しいパスワードを入力して下さい
\ No newline at end of file
diff --git a/lib/plugins/acl/lang/ja/lang.php b/lib/plugins/acl/lang/ja/lang.php
index 831fd2d5c..5bebb58a9 100644
--- a/lib/plugins/acl/lang/ja/lang.php
+++ b/lib/plugins/acl/lang/ja/lang.php
@@ -8,6 +8,7 @@
  * @author Ikuo Obataya 
  * @author Daniel Dupriest 
  * @author Kazutaka Miyasaka 
+ * @author Taisuke Shimamoto 
  */
 $lang['admin_acl']             = 'アクセスコントロール管理';
 $lang['acl_group']             = 'グループ';
diff --git a/lib/plugins/config/lang/ja/lang.php b/lib/plugins/config/lang/ja/lang.php
index f1d2e3e8f..fb263fe00 100644
--- a/lib/plugins/config/lang/ja/lang.php
+++ b/lib/plugins/config/lang/ja/lang.php
@@ -8,6 +8,7 @@
  * @author Ikuo Obataya 
  * @author Daniel Dupriest 
  * @author Kazutaka Miyasaka 
+ * @author Taisuke Shimamoto 
  */
 $lang['menu']                  = 'サイト設定';
 $lang['error']                 = '不正な値が存在するため、設定は更新されませんでした。入力値を確認してから、再度更新してください。
@@ -48,6 +49,8 @@ $lang['cookiedir']             = 'Cookie のパス。空欄にすると baseurl
 $lang['start']                 = 'スタートページ名';
 $lang['title']                 = 'WIKIタイトル';
 $lang['template']              = 'テンプレート';
+$lang['tagline']               = 'キャッチフレーズ (テンプレートが対応していれば)';
+$lang['sidebar']               = 'サイドバー用ページ名 (テンプレートが対応していれば)。空欄でサイドバー無効。';
 $lang['license']               = '作成した内容をどのライセンスでリリースしますか？';
 $lang['fullpath']              = 'ページのフッターに絶対パスを表示';
 $lang['recent']                = '最近の変更表示数';
@@ -91,6 +94,8 @@ $lang['disableactions_other']  = 'その他の動作（カンマ区切り）';
 $lang['sneaky_index']          = 'デフォルトでは索引にすべての名前空間を表示しますが、この機能はユーザーに閲覧権限のない名前空間を非表示にします。ただし、閲覧が可能な副名前空間まで表示されなくなるため、ACLの設定が適正でない場合は索引機能が使えなくなる場合があります。';
 $lang['auth_security_timeout'] = '認証タイムアウト設定（秒）';
 $lang['securecookie']          = 'クッキーをHTTPSにてセットする場合は、ブラウザよりHTTPS経由で送信された場合にみに制限しますか？ログインのみをSSLで行う場合は、この機能を無効にしてください。';
+$lang['xmlrpc']                = 'XML-RPCインターフェースを有効/無効にする';
+$lang['xmlrpcuser']            = 'XML-RPCアクセスを指定グループとユーザーに制限します（半角コンマ区切り）。　すべての人にアクセスを許可する場合は空のままにしてください。';
 $lang['updatecheck']           = 'DokuWikiの更新とセキュリティに関する情報をチェックしますか？ この機能は update.dokuwiki.org への接続が必要です。';
 $lang['userewrite']            = 'URLの書き換え';
 $lang['useslash']              = 'URL上の名前空間の区切りにスラッシュを使用';
@@ -130,6 +135,7 @@ $lang['rss_content']           = 'XMLフィードに何を表示させますか
 $lang['rss_update']            = 'RSSフィードの更新間隔（秒）';
 $lang['recent_days']           = '最近の変更とする期間（日数）';
 $lang['rss_show_summary']      = 'フィードのタイトルにサマリーを表示';
+$lang['rss_media']             = 'XMLフィードで、どんな種類の変更を記載するか';
 $lang['target____wiki']        = '内部リンクの表示先';
 $lang['target____interwiki']   = 'InterWikiリンクの表示先';
 $lang['target____extern']      = '外部リンクの表示先';
diff --git a/lib/plugins/plugin/lang/ja/lang.php b/lib/plugins/plugin/lang/ja/lang.php
index a96dcc9be..d366806c3 100644
--- a/lib/plugins/plugin/lang/ja/lang.php
+++ b/lib/plugins/plugin/lang/ja/lang.php
@@ -8,6 +8,7 @@
  * @author Ikuo Obataya 
  * @author Daniel Dupriest 
  * @author Kazutaka Miyasaka 
+ * @author Taisuke Shimamoto 
  */
 $lang['menu']                  = 'プラグイン管理';
 $lang['download']              = 'プラグインのダウンロードとインストール';
diff --git a/lib/plugins/popularity/lang/ja/lang.php b/lib/plugins/popularity/lang/ja/lang.php
index 736924bb1..f5e280db5 100644
--- a/lib/plugins/popularity/lang/ja/lang.php
+++ b/lib/plugins/popularity/lang/ja/lang.php
@@ -6,6 +6,7 @@
  * @author Daniel Dupriest 
  * @author Kazutaka Miyasaka 
  * @author Yuji Takenaka 
+ * @author Taisuke Shimamoto 
  */
 $lang['name']                  = '利用状況調査（ロードに少し時間が掛かります）';
 $lang['submit']                = 'データ送信';
diff --git a/lib/plugins/revert/lang/ja/lang.php b/lib/plugins/revert/lang/ja/lang.php
index 0cd8c6f9b..bb5a9c150 100644
--- a/lib/plugins/revert/lang/ja/lang.php
+++ b/lib/plugins/revert/lang/ja/lang.php
@@ -5,6 +5,7 @@
  * @author Ikuo Obataya 
  * @author Daniel Dupriest 
  * @author Kazutaka Miyasaka 
+ * @author Taisuke Shimamoto 
  */
 $lang['menu']                  = '復元管理';
 $lang['filter']                = 'スパムを受けたページを検索';
diff --git a/lib/plugins/usermanager/lang/ja/lang.php b/lib/plugins/usermanager/lang/ja/lang.php
index 321bbafe8..b5fd556dc 100644
--- a/lib/plugins/usermanager/lang/ja/lang.php
+++ b/lib/plugins/usermanager/lang/ja/lang.php
@@ -6,6 +6,7 @@
  * @author Ikuo Obataya 
  * @author Daniel Dupriest 
  * @author Kazutaka Miyasaka 
+ * @author Taisuke Shimamoto 
  */
 $lang['menu']                  = 'ユーザー管理';
 $lang['noauth']                = '（ユーザー認証が無効です）';
-- 
cgit v1.2.3


From a4ffa98be918b511b2a80d03d5ce147dc1cef0b7 Mon Sep 17 00:00:00 2001
From: Anika Henke 
Date: Fri, 23 Mar 2012 23:31:53 +0000
Subject: updated template.info.txt

---
 lib/tpl/dokuwiki/template.info.txt | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/tpl/dokuwiki/template.info.txt b/lib/tpl/dokuwiki/template.info.txt
index e049270ee..3f904c6c8 100644
--- a/lib/tpl/dokuwiki/template.info.txt
+++ b/lib/tpl/dokuwiki/template.info.txt
@@ -1,7 +1,7 @@
 base     dokuwiki
 author   Anika Henke, Andreas Gohr, Clarence Lee
 email    andi@splitbrain.org
-date     2012-01-30
+date     2012-03-24
 name     DokuWiki Template
-desc     DokuWiki's default template 2012
-url      http://www.dokuwiki.org/template
+desc     DokuWiki's default template since 2012
+url      http://www.dokuwiki.org/template:dokuwiki
-- 
cgit v1.2.3


From 57fc5eddedf96b52f76700b70686359a594b2031 Mon Sep 17 00:00:00 2001
From: Anika Henke 
Date: Fri, 23 Mar 2012 23:58:44 +0000
Subject: removed a few comments in new template files

---
 lib/tpl/dokuwiki/detail.php     |  9 +--------
 lib/tpl/dokuwiki/main.php       | 15 ++++-----------
 lib/tpl/dokuwiki/tpl_header.php |  7 ++-----
 3 files changed, 7 insertions(+), 24 deletions(-)

diff --git a/lib/tpl/dokuwiki/detail.php b/lib/tpl/dokuwiki/detail.php
index 287827253..90ae492bd 100644
--- a/lib/tpl/dokuwiki/detail.php
+++ b/lib/tpl/dokuwiki/detail.php
@@ -30,14 +30,7 @@ $showSidebar = $conf['sidebar'] && page_exists($conf['sidebar']) && ($ACT=='show
 
 
 
-    
     
-
-    
-     are added to make it possible to e.g. style a page differently if it's in edit mode,
-         see http://www.dokuwiki.org/devel:action_modes for a list of action modes */ ?>
-    
     
    
 
@@ -53,7 +46,7 @@ $showSidebar = $conf['sidebar'] && page_exists($conf['sidebar']) && ($ACT=='show
                 
 
                 
    
-                    
+                    
                     
                     
                     
 
 
-    
     
-
-    
-     are added to make it possible to e.g. style a page differently if it's in edit mode,
-         see http://www.dokuwiki.org/devel:action_modes for a list of action modes */ ?>
-    
     
    
 
@@ -45,9 +38,9 @@ $showSidebar = $conf['sidebar'] && page_exists($conf['sidebar']) && ($ACT=='show
             
                 
                 
    
-                    
+                    
                     
-                    
+                    
                     
                 
    
             
@@ -61,12 +54,12 @@ $showSidebar = $conf['sidebar'] && page_exists($conf['sidebar']) && ($ACT=='show
                     
                     
                     
-                    
+                    
                     
                     
                 
    
 
-                
    
+                
    
 
                 
             
    
diff --git a/lib/tpl/dokuwiki/tpl_header.php b/lib/tpl/dokuwiki/tpl_header.php
index 91d8876b9..9a391aedc 100644
--- a/lib/tpl/dokuwiki/tpl_header.php
+++ b/lib/tpl/dokuwiki/tpl_header.php
@@ -1,7 +1,7 @@
 
 
    
 
-    
+    
     
 
     
    
@@ -12,7 +12,7 @@
         
    
                 
    
                 
      
-                     would be: tpl_action('edit',0,'li') */
                         if ($_SERVER['REMOTE_USER']) {
                             echo '
    • ';
                             tpl_userinfo(); /* 'Logged in as ...' */
@@ -52,7 +50,6 @@
         
      
             
      
             
-            
             
      
                 
             
      
-- 
cgit v1.2.3


From 80cc5b3efdcbdce9ccef38b5936973387b37828a Mon Sep 17 00:00:00 2001
From: Anika Henke 
Date: Sat, 24 Mar 2012 00:03:08 +0000
Subject: removed problematic 'overflow: hidden' from lists again ('unfixes'
 FS#1950)

---
 lib/tpl/dokuwiki/css/basic.css | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lib/tpl/dokuwiki/css/basic.css b/lib/tpl/dokuwiki/css/basic.css
index e1cd1d9a2..ae9be499e 100644
--- a/lib/tpl/dokuwiki/css/basic.css
+++ b/lib/tpl/dokuwiki/css/basic.css
@@ -104,7 +104,6 @@ div {
 ul,
 ol {
     padding: 0 0 0 1.5em;
-    overflow: hidden;
 }
 li,
 dd {
-- 
cgit v1.2.3


From 3ce88cce949483f963c881c3c868bd49c4d989c0 Mon Sep 17 00:00:00 2001
From: Anika Henke 
Date: Sat, 24 Mar 2012 00:24:47 +0000
Subject: added explanation to todo in _forms.css

---
 lib/tpl/dokuwiki/css/_forms.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/tpl/dokuwiki/css/_forms.css b/lib/tpl/dokuwiki/css/_forms.css
index 39a1ec5d3..0c82f5f8c 100644
--- a/lib/tpl/dokuwiki/css/_forms.css
+++ b/lib/tpl/dokuwiki/css/_forms.css
@@ -1,5 +1,5 @@
 
-/* TODO */
+/* 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
-- 
cgit v1.2.3


From e601443821436ad3b9cd9b8ec9a478a50d77d3e0 Mon Sep 17 00:00:00 2001
From: Anika Henke 
Date: Sat, 24 Mar 2012 00:32:53 +0000
Subject: wrapped X-UA-Compatible meta tag with conditional comments

---
 lib/tpl/dokuwiki/detail.php       | 2 +-
 lib/tpl/dokuwiki/main.php         | 2 +-
 lib/tpl/dokuwiki/mediamanager.php | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/tpl/dokuwiki/detail.php b/lib/tpl/dokuwiki/detail.php
index 90ae492bd..baa454edc 100644
--- a/lib/tpl/dokuwiki/detail.php
+++ b/lib/tpl/dokuwiki/detail.php
@@ -18,7 +18,7 @@ $showSidebar = $conf['sidebar'] && page_exists($conf['sidebar']) && ($ACT=='show
  lang="" dir="">
 
     
-    
+    
     
         <?php echo hsc(tpl_img_getTag('IPTC.Headline',$IMG))?>
         [<?php echo strip_tags($conf['title'])?>]
diff --git a/lib/tpl/dokuwiki/main.php b/lib/tpl/dokuwiki/main.php
index 44a8d4a19..9bc221711 100644
--- a/lib/tpl/dokuwiki/main.php
+++ b/lib/tpl/dokuwiki/main.php
@@ -18,7 +18,7 @@ $showSidebar = $conf['sidebar'] && page_exists($conf['sidebar']) && ($ACT=='show
   lang="<?php echo $conf['lang'] ?>" dir="<?php echo $lang['direction'] ?>">
 <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
+    <!--[if IE]><meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" /><![endif]-->
     <title><?php tpl_pagetitle() ?> [<?php echo strip_tags($conf['title']) ?>]
     
     
diff --git a/lib/tpl/dokuwiki/mediamanager.php b/lib/tpl/dokuwiki/mediamanager.php
index d7d88f936..0651b448d 100644
--- a/lib/tpl/dokuwiki/mediamanager.php
+++ b/lib/tpl/dokuwiki/mediamanager.php
@@ -15,7 +15,7 @@ if (!defined('DOKU_INC')) die();
   lang="" dir="" class="popup">
 
     
-    
+    
     
         <?php echo hsc($lang['mediaselect'])?>
         [<?php echo strip_tags($conf['title'])?>]
-- 
cgit v1.2.3


From 5e984c56d67aafecf27d7fddd922484a0318c9db Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Sat, 24 Mar 2012 11:51:44 +0000
Subject: added accidentally removed '<?php' back in (was in 57fc5edd)

---
 lib/tpl/dokuwiki/tpl_header.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/tpl/dokuwiki/tpl_header.php b/lib/tpl/dokuwiki/tpl_header.php
index 9a391aedc..35b3cf636 100644
--- a/lib/tpl/dokuwiki/tpl_header.php
+++ b/lib/tpl/dokuwiki/tpl_header.php
@@ -32,6 +32,7 @@
             <div id="dokuwiki__usertools">
                 <h3 class="a11y"><?php echo $lang['user_tools']; ?></h3>
                 <ul>
+                    <?php
                         if ($_SERVER['REMOTE_USER']) {
                             echo '<li class="user">';
                             tpl_userinfo(); /* 'Logged in as ...' */
-- 
cgit v1.2.3


From ea62d5316150a9477d962aff311f9c6f64f68db7 Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Sat, 24 Mar 2012 17:44:25 +0000
Subject: deleted very old (and unused) images

---
 lib/images/arrow_down.gif | Bin 273 -> 0 bytes
 lib/images/arrow_up.gif   | Bin 274 -> 0 bytes
 lib/images/at.gif         | Bin 57 -> 0 bytes
 lib/images/close.png      | Bin 137 -> 0 bytes
 lib/images/del.png        | Bin 355 -> 0 bytes
 lib/images/edit.gif       | Bin 142 -> 0 bytes
 lib/images/icon-file.png  | Bin 3363 -> 0 bytes
 lib/images/icon-thumb.png | Bin 969 -> 0 bytes
 lib/images/list-minus.gif | Bin 64 -> 0 bytes
 lib/images/list-plus.gif  | Bin 67 -> 0 bytes
 lib/images/pencil.png     | Bin 391 -> 0 bytes
 11 files changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 lib/images/arrow_down.gif
 delete mode 100644 lib/images/arrow_up.gif
 delete mode 100644 lib/images/at.gif
 delete mode 100644 lib/images/close.png
 delete mode 100644 lib/images/del.png
 delete mode 100644 lib/images/edit.gif
 delete mode 100644 lib/images/icon-file.png
 delete mode 100644 lib/images/icon-thumb.png
 delete mode 100644 lib/images/list-minus.gif
 delete mode 100644 lib/images/list-plus.gif
 delete mode 100644 lib/images/pencil.png

diff --git a/lib/images/arrow_down.gif b/lib/images/arrow_down.gif
deleted file mode 100644
index ff13b9585..000000000
Binary files a/lib/images/arrow_down.gif and /dev/null differ
diff --git a/lib/images/arrow_up.gif b/lib/images/arrow_up.gif
deleted file mode 100644
index d491c18db..000000000
Binary files a/lib/images/arrow_up.gif and /dev/null differ
diff --git a/lib/images/at.gif b/lib/images/at.gif
deleted file mode 100644
index 8bdf40d54..000000000
Binary files a/lib/images/at.gif and /dev/null differ
diff --git a/lib/images/close.png b/lib/images/close.png
deleted file mode 100644
index 4ccef0603..000000000
Binary files a/lib/images/close.png and /dev/null differ
diff --git a/lib/images/del.png b/lib/images/del.png
deleted file mode 100644
index e59ded55f..000000000
Binary files a/lib/images/del.png and /dev/null differ
diff --git a/lib/images/edit.gif b/lib/images/edit.gif
deleted file mode 100644
index a2a23de7b..000000000
Binary files a/lib/images/edit.gif and /dev/null differ
diff --git a/lib/images/icon-file.png b/lib/images/icon-file.png
deleted file mode 100644
index d350c8c31..000000000
Binary files a/lib/images/icon-file.png and /dev/null differ
diff --git a/lib/images/icon-thumb.png b/lib/images/icon-thumb.png
deleted file mode 100644
index ccc7a101d..000000000
Binary files a/lib/images/icon-thumb.png and /dev/null differ
diff --git a/lib/images/list-minus.gif b/lib/images/list-minus.gif
deleted file mode 100644
index 36902f159..000000000
Binary files a/lib/images/list-minus.gif and /dev/null differ
diff --git a/lib/images/list-plus.gif b/lib/images/list-plus.gif
deleted file mode 100644
index adc3fac8a..000000000
Binary files a/lib/images/list-plus.gif and /dev/null differ
diff --git a/lib/images/pencil.png b/lib/images/pencil.png
deleted file mode 100644
index 78142b61e..000000000
Binary files a/lib/images/pencil.png and /dev/null differ
-- 
cgit v1.2.3


From 42ff673048d169bcbec5e4bb17619d66e6f6f61d Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Sun, 25 Mar 2012 14:41:39 +0100
Subject: fixed performance issues with gradient in Firefox (which also added
 gradient support for IE9) (FS#2447)

* removed all occurrences of '-moz-linear-gradient'
* added SVG as fallback for Firefox, IE9 and other browsers to page background and buttons
---
 lib/tpl/dokuwiki/css/basic.css              | 13 ++++++++-----
 lib/tpl/dokuwiki/css/content.css            |  2 +-
 lib/tpl/dokuwiki/images/page-background.svg |  8 ++++++++
 3 files changed, 17 insertions(+), 6 deletions(-)
 create mode 100644 lib/tpl/dokuwiki/images/page-background.svg

diff --git a/lib/tpl/dokuwiki/css/basic.css b/lib/tpl/dokuwiki/css/basic.css
index ae9be499e..dce632b9a 100644
--- a/lib/tpl/dokuwiki/css/basic.css
+++ b/lib/tpl/dokuwiki/css/basic.css
@@ -16,7 +16,8 @@ html,
 body {
     color: __text__;
     background-color: __background_site__;
-    background-image: -moz-linear-gradient(   top, __background_neu__ 0%, __background_alt__ 1em, __background_site__ 4em);
+    background-image: url(images/page-background.svg);
+    /*background-image: -moz-linear-gradient(   top, __background_neu__ 0%, __background_alt__ 1em, __background_site__ 4em); see FS#2447*/
     background-image: -webkit-linear-gradient(top, __background_neu__ 0%, __background_alt__ 1em, __background_site__ 4em);
     background-image: -o-linear-gradient(     top, __background_neu__ 0%, __background_alt__ 1em, __background_site__ 4em);
     background-image: -ms-linear-gradient(    top, __background_neu__ 0%, __background_alt__ 1em, __background_site__ 4em);
@@ -333,7 +334,8 @@ button,
 .qq-upload-button {
     color: #333;
     background-color: #eee;
-    background: -moz-linear-gradient(   top, #ffffff 0%, #f4f4f4 30%, #eeeeee 99%, #cccccc 99%);
+    background-image: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIHZpZXdCb3g9IjAgMCAxIDEiIHByZXNlcnZlQXNwZWN0UmF0aW89Im5vbmUiPgo8bGluZWFyR3JhZGllbnQgaWQ9Imc4MjQiIGdyYWRpZW50VW5pdHM9InVzZXJTcGFjZU9uVXNlIiB4MT0iMCUiIHkxPSIwJSIgeDI9IjAlIiB5Mj0iMTAwJSI+CjxzdG9wIHN0b3AtY29sb3I9IiNGRkZGRkYiIG9mZnNldD0iMCIvPjxzdG9wIHN0b3AtY29sb3I9IiNGNEY0RjQiIG9mZnNldD0iMC4zIi8+PHN0b3Agc3RvcC1jb2xvcj0iI0VFRUVFRSIgb2Zmc2V0PSIwLjk5Ii8+PHN0b3Agc3RvcC1jb2xvcj0iI0NDQ0NDQyIgb2Zmc2V0PSIuOTkiLz4KPC9saW5lYXJHcmFkaWVudD4KPHJlY3QgeD0iMCIgeT0iMCIgd2lkdGg9IjEiIGhlaWdodD0iMSIgZmlsbD0idXJsKCNnODI0KSIgLz4KPC9zdmc+);
+    /*background: -moz-linear-gradient(   top, #ffffff 0%, #f4f4f4 30%, #eeeeee 99%, #cccccc 99%); see FS#2447*/
     background: -webkit-linear-gradient(top, #ffffff 0%, #f4f4f4 30%, #eeeeee 99%, #cccccc 99%);
     background: -o-linear-gradient(     top, #ffffff 0%, #f4f4f4 30%, #eeeeee 99%, #cccccc 99%);
     background: -ms-linear-gradient(    top, #ffffff 0%, #f4f4f4 30%, #eeeeee 99%, #cccccc 99%);
@@ -359,10 +361,11 @@ button:focus,
 .qq-upload-button:hover {
     border-color: #999;
     background-color: #ddd;
-    background: -moz-linear-gradient(   top, #ffffff 0%, #f4f4f4 30%, #dddddd 99%, #cccccc 99%);
+    background-image:url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIHZpZXdCb3g9IjAgMCAxIDEiIHByZXNlcnZlQXNwZWN0UmF0aW89Im5vbmUiPgo8bGluZWFyR3JhZGllbnQgaWQ9Imc2NzAiIGdyYWRpZW50VW5pdHM9InVzZXJTcGFjZU9uVXNlIiB4MT0iMCUiIHkxPSIwJSIgeDI9IjAlIiB5Mj0iMTAwJSI+CjxzdG9wIHN0b3AtY29sb3I9IiNGRkZGRkYiIG9mZnNldD0iMCIvPjxzdG9wIHN0b3AtY29sb3I9IiNGNEY0RjQiIG9mZnNldD0iMC4zIi8+PHN0b3Agc3RvcC1jb2xvcj0iI0RERERERCIgb2Zmc2V0PSIwLjk5Ii8+PHN0b3Agc3RvcC1jb2xvcj0iI0JCQkJCQiIgb2Zmc2V0PSIuOTkiLz4KPC9saW5lYXJHcmFkaWVudD4KPHJlY3QgeD0iMCIgeT0iMCIgd2lkdGg9IjEiIGhlaWdodD0iMSIgZmlsbD0idXJsKCNnNjcwKSIgLz4KPC9zdmc+);
+    /*background: -moz-linear-gradient(   top, #ffffff 0%, #f4f4f4 30%, #dddddd 99%, #cccccc 99%); see FS#2447*/
     background: -webkit-linear-gradient(top, #ffffff 0%, #f4f4f4 30%, #dddddd 99%, #bbbbbb 99%);
-    background: -o-linear-gradient(     top, #ffffff 0%, #f4f4f4 30%, #dddddd 99%, #cccccc 99%);
-    background: -ms-linear-gradient(    top, #ffffff 0%, #f4f4f4 30%, #dddddd 99%, #cccccc 99%);
+    background: -o-linear-gradient(     top, #ffffff 0%, #f4f4f4 30%, #dddddd 99%, #bbbbbb 99%);
+    background: -ms-linear-gradient(    top, #ffffff 0%, #f4f4f4 30%, #dddddd 99%, #bbbbbb 99%);
     background: linear-gradient(        top, #ffffff 0%, #f4f4f4 30%, #dddddd 99%, #bbbbbb 99%);
 }
 
diff --git a/lib/tpl/dokuwiki/css/content.css b/lib/tpl/dokuwiki/css/content.css
index ca2294950..7cb7c6edf 100644
--- a/lib/tpl/dokuwiki/css/content.css
+++ b/lib/tpl/dokuwiki/css/content.css
@@ -119,7 +119,7 @@
 .dokuwiki dl.code dt,
 .dokuwiki dl.file dt {
     background-color: __background_alt__;
-    background: -moz-linear-gradient(   top, __background__ 0%, __background_alt__ 100%);
+    /*background: -moz-linear-gradient(   top, __background__ 0%, __background_alt__ 100%); see FS#2447 */
     background: -webkit-linear-gradient(top, __background__ 0%, __background_alt__ 100%);
     background: -o-linear-gradient(     top, __background__ 0%, __background_alt__ 100%);
     background: -ms-linear-gradient(    top, __background__ 0%, __background_alt__ 100%);
diff --git a/lib/tpl/dokuwiki/images/page-background.svg b/lib/tpl/dokuwiki/images/page-background.svg
new file mode 100644
index 000000000..086341ddf
--- /dev/null
+++ b/lib/tpl/dokuwiki/images/page-background.svg
@@ -0,0 +1,8 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%">
+    <linearGradient id="g" x1="0%" y1="0%" x2="0%" y2="100%">
+        <stop offset="0" stop-color="#dddddd" />
+        <stop offset="0.1" stop-color="#eeeeee" />
+        <stop offset="0.4" stop-color="#fbfaf9" />
+    </linearGradient>
+    <rect x="0" y="0" width="100%" height="100%" fill="url(#g)" />
+</svg>
\ No newline at end of file
-- 
cgit v1.2.3


From 9d421a3d3c1411a47d49f43cfc1f798f6a96ab8c Mon Sep 17 00:00:00 2001
From: Erial Krale <erial2@gmail.com>
Date: Mon, 26 Mar 2012 20:44:07 +0200
Subject: Korean language update

---
 inc/lang/ko/lang.php                | 3 +++
 inc/lang/ko/resetpwd.txt            | 3 +++
 lib/plugins/config/lang/ko/lang.php | 3 +++
 3 files changed, 9 insertions(+)
 create mode 100644 inc/lang/ko/resetpwd.txt

diff --git a/inc/lang/ko/lang.php b/inc/lang/ko/lang.php
index 9be5df4b7..84fdb3c48 100644
--- a/inc/lang/ko/lang.php
+++ b/inc/lang/ko/lang.php
@@ -44,6 +44,7 @@ $lang['btn_backtomedia']       = '미디어 파일 선택으로 돌아가기';
 $lang['btn_subscribe']         = '구독 신청';
 $lang['btn_profile']           = '개인정보 변경';
 $lang['btn_reset']             = '초기화';
+$lang['btn_resendpwd']         = '새 암호 설정';
 $lang['btn_draft']             = '문서초안 편집';
 $lang['btn_recover']           = '문서초안 복구';
 $lang['btn_draftdel']          = '문서초안 삭제';
@@ -80,6 +81,7 @@ $lang['profnoempty']           = '이름이나 이메일 주소가 비었습니
 $lang['profchanged']           = '개인정보 변경이 성공했습니다.';
 $lang['pwdforget']             = '패스워드를 잊어버린 경우 새로 발급받을 수 있습니다.';
 $lang['resendna']              = '이 위키는 패스워드 재발급을 지원하지 않습니다.';
+$lang['resendpwd']             = '새 암호 다음으로 전송 : ';
 $lang['resendpwdmissing']      = '새로운 패스워드를 입력해야햡니다.';
 $lang['resendpwdnouser']       = '등록된 사용자가 아닙니다. 다시 확인 바랍니다.';
 $lang['resendpwdbadauth']      = '인증 코드가 틀립니다. 잘못된 링크인지 확인 바랍니다.';
@@ -261,6 +263,7 @@ $lang['subscr_style_digest']   = '각 페이지의 변화를 요약 (매 %.2f 
 $lang['subscr_style_list']     = '마지막 이메일 이후 변화된 페이지의 목록 (매 %.2f 일 마다)';
 $lang['authmodfailed']         = '잘못된 사용자 인증 설정입니다. 관리자에게 문의하기 바랍니다.';
 $lang['authtempfail']          = '사용자 인증이 일시적으로 불가능합니다. 만일 계속해서 문제가 발생하면 관리자에게 문의하기 바랍니다.';
+$lang['authpwdexpire']         = '현재 암호를 설정하신지 %d 일이 지났습니다. 새로 설정해주시기 바랍니다.';
 $lang['i_chooselang']          = '사용하는 언어를 선택합니다.';
 $lang['i_installer']           = 'DokuWiki 설치';
 $lang['i_wikiname']            = '위키 이름';
diff --git a/inc/lang/ko/resetpwd.txt b/inc/lang/ko/resetpwd.txt
new file mode 100644
index 000000000..b84674b82
--- /dev/null
+++ b/inc/lang/ko/resetpwd.txt
@@ -0,0 +1,3 @@
+====== 새 암호 설정 ======
+
+이 위키의 계정의 새 암호를 입력해주세요.
\ No newline at end of file
diff --git a/lib/plugins/config/lang/ko/lang.php b/lib/plugins/config/lang/ko/lang.php
index 55207a37a..82863b684 100644
--- a/lib/plugins/config/lang/ko/lang.php
+++ b/lib/plugins/config/lang/ko/lang.php
@@ -95,6 +95,8 @@ $lang['sneaky_index']          = '기본적으로, DokuWiki는 색인 목록에
 특정 ACL 설정은 색인 사용이 불가능하게 할 수도 있습니다.';
 $lang['auth_security_timeout'] = '인증 보안 초과 시간(초)';
 $lang['securecookie']          = 'HTTPS로 보내진 쿠키는 HTTPS에만 적용 할까요? 위키의 로그인 페이지만 SSL로 암호화 하고 위키 페이지는 그렇지 않은경우 꺼야 합니다.';
+$lang['xmlrpc']                = 'XML-RPC 인터페이스 지원/무시';
+$lang['xmlrpcuser']            = '주어진 그룹이나 유저들에게만 XML-RPC접근을 허락하려면 컴마로 구분하여 적으세요. 비어두면 모두에게 허용됩니다.';
 $lang['updatecheck']           = '업데이트와 보안 문제를 검사(DokuWiki를 update.dokuwiki.org에 연결해야 합니다.)';
 $lang['userewrite']            = 'URL rewriting기능 사용';
 $lang['useslash']              = 'URL에서 네임스페이스 구분자로 슬래쉬 문자 사용';
@@ -135,6 +137,7 @@ $lang['rss_content']           = 'XML feed 항목들에 표시되는 내용은?'
 $lang['rss_update']            = 'XML feed 갱신 주기(초)';
 $lang['recent_days']           = '최근 바뀐 페이지 기준 시간(날짜)';
 $lang['rss_show_summary']      = 'XML feed 제목에서 요약정보 보여주기';
+$lang['rss_media']             = '어떤 규격으로 XML 피드를 받아보시겠습니까?';
 $lang['target____wiki']        = '내부 링크들에 대한 타겟 윈도우 ';
 $lang['target____interwiki']   = 'InterWiki 링크들에 대한 타겟 윈도우';
 $lang['target____extern']      = '외부 링크들에 대한 타겟 윈도우';
-- 
cgit v1.2.3


From 51b120f658e9d28fa503e2adf78771e1abfc4d35 Mon Sep 17 00:00:00 2001
From: Kiril LastName <neohidra@gmail.com>
Date: Tue, 3 Apr 2012 22:58:41 +0300
Subject: BG: language update

---
 inc/lang/bg/lang.php                | 72 ++++++++++++++++++++++++++++--------
 inc/lang/bg/resetpwd.txt            |  4 ++
 lib/plugins/config/lang/bg/lang.php | 74 +++++++++++++++++++++++++++++++++----
 3 files changed, 126 insertions(+), 24 deletions(-)
 create mode 100644 inc/lang/bg/resetpwd.txt

diff --git a/inc/lang/bg/lang.php b/inc/lang/bg/lang.php
index 04000d10e..7a246024d 100644
--- a/inc/lang/bg/lang.php
+++ b/inc/lang/bg/lang.php
@@ -9,11 +9,12 @@
  */
 $lang['encoding']              = 'utf-8';
 $lang['direction']             = 'ltr';
-$lang['doublequoteopening']    = '“';
-$lang['doublequoteclosing']    = '”';
-$lang['singlequoteopening']    = '‘';
-$lang['singlequoteclosing']    = '’';
-$lang['apostrophe']            = '’';
+$lang['doublequoteopening']    = '“'; //“
+$lang['doublequoteclosing']    = '”'; //”
+$lang['singlequoteopening']    = '‘'; //‘
+$lang['singlequoteclosing']    = '’'; //’
+$lang['apostrophe']            = '’'; //’
+
 $lang['btn_edit']              = 'Редактиране';
 $lang['btn_source']            = 'Преглед на кода';
 $lang['btn_show']              = 'Преглед на страницата';
@@ -41,13 +42,15 @@ $lang['btn_backtomedia']       = 'Назад към избора на файл';
 $lang['btn_subscribe']         = 'Абонаменти';
 $lang['btn_profile']           = 'Профил';
 $lang['btn_reset']             = 'Изчистване';
-$lang['btn_draft']             = 'Редактиране на чернова';
-$lang['btn_recover']           = 'Възстановяване на чернова';
-$lang['btn_draftdel']          = 'Изтриване на чернова';
+$lang['btn_resendpwd']         = 'Задаване на нова парола';
+$lang['btn_draft']             = 'Редактиране на черновата';
+$lang['btn_recover']           = 'Възстановяване на черновата';
+$lang['btn_draftdel']          = 'Изтриване на черновата';
 $lang['btn_revert']            = 'Възстановяване';
 $lang['btn_register']          = 'Регистриране';
 $lang['btn_apply']             = 'Прилагане';
 $lang['btn_media']             = 'Диспечер на файлове';
+
 $lang['loggedinas']            = 'Вписани сте като';
 $lang['user']                  = 'Потребител';
 $lang['pass']                  = 'Парола';
@@ -59,9 +62,10 @@ $lang['fullname']              = 'Истинско име';
 $lang['email']                 = 'Електронна поща';
 $lang['profile']               = 'Потребителски профил';
 $lang['badlogin']              = 'Грешно потребителско име или парола.';
-$lang['minoredit']             = 'Незначителни промени';
-$lang['draftdate']             = 'Черновата е автоматично записана на';
+$lang['minoredit']             = 'Промените са незначителни';
+$lang['draftdate']             = 'Черновата е автоматично записана на'; // full dformat date will be added
 $lang['nosecedit']             = 'Страницата бе междувременно променена, презареждане на страницата поради неактуална информация.';
+
 $lang['regmissing']            = 'Моля, попълнете всички полета.';
 $lang['reguexists']            = 'Вече съществува потребител с избраното име.';
 $lang['regsuccess']            = 'Потребителят е създаден, а паролата е пратена по електронната поща.';
@@ -71,19 +75,24 @@ $lang['regbadmail']            = 'Въведеният адрес изглежд
 $lang['regbadpass']            = 'Двете въведени пароли не съвпадат, моля опитайте отново.';
 $lang['regpwmail']             = 'Паролата ви за DokuWiki';
 $lang['reghere']               = 'Все още нямате профил? Направете си';
+
 $lang['profna']                = 'Wiki-то не поддържа промяна на профила';
 $lang['profnochange']          = 'Няма промени.';
 $lang['profnoempty']           = 'Въвеждането на име и ел. поща е задължително';
 $lang['profchanged']           = 'Потребителският профил е обновен успешно.';
+
 $lang['pwdforget']             = 'Забравили сте паролата си? Получете нова';
 $lang['resendna']              = 'Wiki-то не поддържа повторно пращане на паролата.';
+$lang['resendpwd']             = 'Задаване на нова парола за';
 $lang['resendpwdmissing']      = 'Моля, попълнете всички полета.';
 $lang['resendpwdnouser']       = 'Потребителят не е намерен в базата от данни.';
 $lang['resendpwdbadauth']      = 'Кодът за потвърждение е невалиден. Проверете дали сте използвали целия линк за потвърждение.';
 $lang['resendpwdconfirm']      = 'Линк за потвърждение е пратен по електронната поща.';
 $lang['resendpwdsuccess']      = 'Новата ви паролата е пратена по електронната поща.';
+
 $lang['license']               = 'Ако не е посочено друго, съдържанието на Wiki-то е лицензирано под следния лиценз:';
-$lang['licenseok']             = 'Бележка: Редактирайки страницата, вие се съгласявате да лицензирате промените (които сте направили) под следния лиценз:';
+$lang['licenseok']             = 'Бележка: Редактирайки страницата, Вие се съгласявате да лицензирате промените (които сте направили) под следния лиценз:';
+
 $lang['searchmedia']           = 'Търсене на файл: ';
 $lang['searchmedia_in']        = 'Търсене в %s';
 $lang['txt_upload']            = 'Изберете файл за качване';
@@ -91,6 +100,7 @@ $lang['txt_filename']          = 'Качи като (незадължителн
 $lang['txt_overwrt']           = 'Презапиши съществуващите файлове';
 $lang['lockedby']              = 'В момента е заключена от';
 $lang['lockexpire']            = 'Ще бъде отключена на';
+
 $lang['js']['willexpire']      = 'Страницата ще бъде отключена за редактиране след минута.\nЗа предотвратяване на конфликти, ползвайте бутона "Преглед", за рестартиране на брояча за заключване.';
 $lang['js']['notsavedyet']     = 'Незаписаните промени ще бъдат загубени. Желаете ли да продължите?';
 $lang['js']['searchmedia']     = 'Търсене на файлове';
@@ -117,8 +127,7 @@ $lang['js']['medialeft']       = 'Подреди изображението от
 $lang['js']['mediaright']      = 'Подреди изображението отдясно.';
 $lang['js']['mediacenter']     = 'Подреди изображението по средата.';
 $lang['js']['medianoalign']    = 'Без подреждане.';
-$lang['js']['nosmblinks']      = 'Връзките към Windows shares работят само под Internet Explorer.
-Можете да копирате и поставите връзката.';
+$lang['js']['nosmblinks']      = 'Връзките към Windows shares работят само под Internet Explorer.<br />Можете да копирате и поставите връзката.';
 $lang['js']['linkwiz']         = 'Помощник за препратки';
 $lang['js']['linkto']          = 'Препратка към: ';
 $lang['js']['del_confirm']     = 'Да бъдат ли изтрити избраните елементи?';
@@ -133,8 +142,10 @@ $lang['js']['media_done_btn']  = 'Готово';
 $lang['js']['media_drop']      = 'Влачете и пуснете файливе тук, за да бъдат качени';
 $lang['js']['media_cancel']    = 'премахване';
 $lang['js']['media_overwrt']   = 'Презапиши съществуващите файлове';
+
 $lang['rssfailed']             = 'Възникна грешка при получаването на емисията: ';
 $lang['nothingfound']          = 'Нищо не е открито.';
+
 $lang['mediaselect']           = 'Файлове';
 $lang['fileupload']            = 'Качване на файлове';
 $lang['uploadsucc']            = 'Качването е успешно';
@@ -159,6 +170,7 @@ $lang['mediaextchange']        = 'Разширението на файла е с
 $lang['reference']             = 'Връзки за';
 $lang['ref_inuse']             = 'Файлът не може да бъде изтрит, защото все още се ползва от следните страници:';
 $lang['ref_hidden']            = 'Някои връзки са към страници, които нямате права да четете';
+
 $lang['hits']                  = 'Съвпадения';
 $lang['quickhits']             = 'Съвпадащи имена на страници';
 $lang['toc']                   = 'Съдържание';
@@ -182,15 +194,23 @@ $lang['external_edit']         = 'външна редакция';
 $lang['summary']               = 'Обобщение';
 $lang['noflash']               = 'Необходим е <a href="http://www.adobe.com/products/flashplayer/">Adobe Flash Plugin</a> за изобразяване на съдържанието.';
 $lang['download']              = 'Изтегляне на фрагмент';
+$lang['tools']                 = 'Инструменти';
+$lang['user_tools']            = 'Инструменти за потребители';
+$lang['site_tools']            = 'Инструменти за сайта';
+$lang['page_tools']            = 'Инструменти за страници';
+$lang['skip_to_content']       = 'към съдържанието';
+
 $lang['mail_newpage']          = 'добавена страница: ';
 $lang['mail_changed']          = 'променена страница: ';
 $lang['mail_subscribe_list']   = 'променени страници в именно пространство: ';
 $lang['mail_new_user']         = 'нов потребител: ';
 $lang['mail_upload']           = 'качен файл: ';
+
 $lang['changes_type']          = 'Преглед на променените';
 $lang['pages_changes']         = 'Страници';
 $lang['media_changes']         = 'Файлове';
 $lang['both_changes']          = 'Страници и файлове';
+
 $lang['qb_bold']               = 'Удебелен текст';
 $lang['qb_italic']             = 'Курсив текст';
 $lang['qb_underl']             = 'Подчертан текст';
@@ -215,8 +235,11 @@ $lang['qb_media']              = 'Добавяне на изображения 
 $lang['qb_sig']                = 'Вмъкване на подпис';
 $lang['qb_smileys']            = 'Усмивчици';
 $lang['qb_chars']              = 'Специални знаци';
+
 $lang['upperns']               = 'към майчиното именно пространство';
+
 $lang['admin_register']        = 'Добавяне на нов потребител';
+
 $lang['metaedit']              = 'Редактиране на метаданни';
 $lang['metasaveerr']           = 'Записването на метаданните се провали';
 $lang['metasaveok']            = 'Метаданните са запазени успешно';
@@ -234,6 +257,7 @@ $lang['img_keywords']          = 'Ключови думи';
 $lang['img_width']             = 'Ширина';
 $lang['img_height']            = 'Височина';
 $lang['img_manager']           = 'Преглед в диспечера на файлове';
+
 $lang['subscr_subscribe_success'] = '%s е добавен към списъка с абониралите се за %s';
 $lang['subscr_subscribe_error'] = 'Грешка при добавянето на %s към списъка с абониралите се за %s';
 $lang['subscr_subscribe_noaddress'] = 'Добавянето ви към списъка с абонати не е възможно поради липсата на свързан адрес (на ел. поща) с профила ви.';
@@ -241,6 +265,7 @@ $lang['subscr_unsubscribe_success'] = '%s е премахнат от списъ
 $lang['subscr_unsubscribe_error'] = 'Грешка при премахването на %s от списъка с абониралите се за %s';
 $lang['subscr_already_subscribed'] = '%s е вече абониран за %s';
 $lang['subscr_not_subscribed'] = '%s не е абониран за %s';
+// Manage page for subscriptions
 $lang['subscr_m_not_subscribed'] = 'Не сте абониран за текущата страницата или именно пространство.';
 $lang['subscr_m_new_header']   = 'Добави абонамент';
 $lang['subscr_m_current_header'] = 'Текущи абонаменти';
@@ -250,15 +275,22 @@ $lang['subscr_m_receive']      = 'Получаване';
 $lang['subscr_style_every']    = 'на ел. писмо при всяка промяна';
 $lang['subscr_style_digest']   = 'на ел. писмо с обобщение на промените във всяка страница (всеки %.2f дни)';
 $lang['subscr_style_list']     = 'на списък с променените страници от последното ел. писмо (всеки %.2f дни)';
+
+/* auth.class language support */
 $lang['authmodfailed']         = 'Лоша настройки за удостоверяване. Моля, уведомете администратора на Wiki страницата.';
 $lang['authtempfail']          = 'Удостоверяването на потребители не е възможно за момента. Ако продължи дълго, моля уведомете администратора на Wiki страницата.';
+$lang['authpwdexpire']         = 'Срока на паролата ви ще изтече след %d дни. Препорачително е да я смените по-скоро.';
+
+/* installer strings */
 $lang['i_chooselang']          = 'Изберете вашия изик';
 $lang['i_installer']           = 'Инсталатор на DokuWiki';
 $lang['i_wikiname']            = 'Име на Wiki-то';
 $lang['i_enableacl']           = 'Ползване на списък за достъп (ACL) [препоръчително]';
 $lang['i_superuser']           = 'Супер потребител';
 $lang['i_problems']            = 'Открити са проблеми, които възпрепятстват инсталирането. Ще можете да продължите след като отстраните долуизброените проблеми.';
-$lang['i_modified']            = 'Поради мерки за сигурност инсталаторът работи само с нови и непроменени инсталационни файлове. Трябва да разархивирате отново файловете от сваления архив или да се посъветвате с <a href="http://dokuwiki.org/install">Инструкциите за инсталиране на Dokuwiki</a>.';
+$lang['i_modified']            = 'Поради мерки за сигурност инсталаторът работи само с нови и непроменени инсталационни файлове.
+								  Трябва да разархивирате отново файловете от сваления архив или да се посъветвате с <a href="http://dokuwiki.org/install">Инструкциите за инсталиране на Dokuwiki</a>.';
+
 $lang['i_funcna']              = 'PHP функцията <code>%s</code> не е достъпна. Може би е забранена от доставчика на хостинг.';
 $lang['i_phpver']              = 'Инсталираната версия <code>%s</code> на PHP е по-стара от необходимата <code>%s</code>. Актуализирайте PHP инсталацията.';
 $lang['i_permfail']            = '<code>%s</code> не е достъпна за писане от DokuWiki. Трябва да промените правата за достъп до директорията!';
@@ -267,13 +299,16 @@ $lang['i_writeerr']            = '<code>%s</code> не можа да бъде с
 $lang['i_badhash']             = 'Файлът dokuwiki.php не може да бъде разпознат или е променен (hash=<code>%s</code>)';
 $lang['i_badval']              = '<code>%s</code> - непозволена или празна стойност';
 $lang['i_success']             = 'Настройването приключи успешно. Вече можете да изтриете файла install.php. Продължете към <a href="doku.php">Вашето ново DokuWiki</a>.';
-$lang['i_failure']             = 'Възникнаха грешки при записването на файловете с настройки. Вероятно ще се наложи да ги поправите ръчно, за да можете да ползвате <a href="doku.php">Вашето ново DokuWiki</a>.';
+
+$lang['i_failure']             = 'Възникнаха грешки при записването на файловете с настройки. Вероятно ще се наложи да ги поправите ръчно, 
+                                  за да можете да ползвате <a href="doku.php">Вашето ново DokuWiki</a>.';
 $lang['i_policy']              = 'Първоначална политика за достъп';
 $lang['i_pol0']                = 'Отворено Wiki (всеки може да чете, пише и качва)';
 $lang['i_pol1']                = 'Публично Wiki (всеки може да чете, само регистрирани пишат и качват)';
 $lang['i_pol2']                = 'Затворено Wiki (само регистрирани четат, пишат и качват)';
 $lang['i_retry']               = 'Повторен опит';
 $lang['i_license']             = 'Моля, изберете лиценз под който желаете да публикувате съдържанието:';
+
 $lang['recent_global']         = 'В момента преглеждате промените в именно пространство <b>%s</b>. Може да прегледате и <a href="%s">промените в цялото Wiki</a>.';
 $lang['years']                 = 'преди %d години';
 $lang['months']                = 'преди %d месеца';
@@ -282,7 +317,9 @@ $lang['days']                  = 'преди %d дни';
 $lang['hours']                 = 'преди %d часа';
 $lang['minutes']               = 'преди %d минути';
 $lang['seconds']               = 'преди %d секунди';
-$lang['wordblock']             = 'Направените от вас промени не са съхранени, защото съдържат забранен текст (SPAM).';
+
+$lang['wordblock']             = 'Направените от Вас промени не са съхранени, защото съдържат забранен текст (SPAM).';
+
 $lang['media_uploadtab']       = 'Качване';
 $lang['media_searchtab']       = 'Търсене';
 $lang['media_file']            = 'Файл';
@@ -306,4 +343,7 @@ $lang['media_perm_read']       = 'За съжаление нямате дост
 $lang['media_perm_upload']     = 'За съжаление нямате достатъчно права, за да можете да качите файла.';
 $lang['media_update']          = 'Качване на нова версия';
 $lang['media_restore']         = 'Възстановяване на тази версия';
+
 $lang['plugin_install_err']    = 'Неправилно инсталирана приставка. Моля, преименувайте директорията \'%s\' на \'%s\'.';
+
+//Setup VIM: ex: et ts=2 :
diff --git a/inc/lang/bg/resetpwd.txt b/inc/lang/bg/resetpwd.txt
new file mode 100644
index 000000000..caa4adfdc
--- /dev/null
+++ b/inc/lang/bg/resetpwd.txt
@@ -0,0 +1,4 @@
+====== Задаване на нова парола ======
+
+Моля, въведете нова парола за вашия акаунт в Wiki страницата.
+
diff --git a/lib/plugins/config/lang/bg/lang.php b/lib/plugins/config/lang/bg/lang.php
index 25f1da91a..0bc25a8e5 100644
--- a/lib/plugins/config/lang/bg/lang.php
+++ b/lib/plugins/config/lang/bg/lang.php
@@ -7,19 +7,28 @@
  * @author Viktor Usunov <usun0v@mail.bg>
  * @author Kiril <neohidra@gmail.com>
  */
+
+// for admin plugins, the menu prompt to be displayed in the admin menu
+// if set here, the plugin doesn't need to override the getMenuText() method
 $lang['menu']                  = 'Настройки';
+
 $lang['error']                 = 'Обновяването на настройките не е възможно, поради невалидна стойност, моля, прегледайте промените си и пробвайте отново.
-<br />Неверните стойности ще бъдат обградени с червена рамка.';
+                       <br />Неверните стойности ще бъдат обградени с червена рамка.';
 $lang['updated']               = 'Обновяването на настройките е успешно.';
 $lang['nochoice']              = '(няма друг възможен избор)';
-$lang['locked']                = 'Обновяването на файла с настройките не е възможно, ако това не е нарочно, проверете,<br /> дали името на локалния файл с настройки и правата са верни.';
-$lang['danger']                = 'Внимание: промяна на опцията може да направи wiki-то и менюто за настройване недостъпни.';
+$lang['locked']                = 'Обновяването на файла с настройките не е възможно, ако това не е нарочно, проверете,<br />
+                       дали името на локалния файл с настройки и правата са верни.';
+$lang['danger']                = 'Внимание: промяна на опцията може да направи Wiki-то и менюто за настройване недостъпни.';
 $lang['warning']               = 'Предупреждение: промяна на опцията може предизвика нежелани последици.';
 $lang['security']              = 'Предупреждение: промяна на опцията може да представлява риск за сигурността.';
-$lang['_configuration_manager'] = 'Диспечер на настройките';
+
+/* --- Config Setting Headers --- */
+$lang['_configuration_manager'] = 'Диспечер на настройките'; //same as heading in intro.txt
 $lang['_header_dokuwiki']      = 'Настройки на DokuWiki';
 $lang['_header_plugin']        = 'Настройки на приставки';
 $lang['_header_template']      = 'Настройки на шаблони';
+
+/* --- Config Setting Groups --- */
 $lang['_header_undefined']     = 'Неопределени настройки';
 $lang['_basic']                = 'Основни настройки';
 $lang['_display']              = 'Настройки за изобразяване';
@@ -30,11 +39,20 @@ $lang['_links']                = 'Настройки на препратките
 $lang['_media']                = 'Настройки на медията';
 $lang['_advanced']             = 'Допълнителни настройки';
 $lang['_network']              = 'Мрежови настройки';
+// The settings group name for plugins and templates can be set with
+// plugin_settings_name and template_settings_name respectively. If one
+// of these lang properties is not set, the group name will be generated
+// from the plugin or template name and the localized suffix.
 $lang['_plugin_sufix']         = ' - настройки на приставката';
 $lang['_template_sufix']       = ' - настройки на шаблона';
+
+/* --- Undefined Setting Messages --- */
 $lang['_msg_setting_undefined'] = 'Няма метаданни за настройките.';
 $lang['_msg_setting_no_class'] = 'Няма клас настройки.';
 $lang['_msg_setting_no_default'] = 'Няма стандартна стойност.';
+
+/* -------------------- Config Options --------------------------- */
+
 $lang['fmode']                 = 'Режим (права) за създаване на файлове';
 $lang['dmode']                 = 'Режим (права) за създаване на директории';
 $lang['lang']                  = 'Език';
@@ -45,6 +63,8 @@ $lang['cookiedir']             = 'Път за бисквитките. Остав
 $lang['start']                 = 'Име на началната страница';
 $lang['title']                 = 'Име на Wiki-то';
 $lang['template']              = 'Шаблон';
+$lang['tagline']               = 'Подзаглавие - изобразява се под името на Wiki страницата (ако се поддържа от шаблона)';
+$lang['sidebar']               = 'Име на страницата за страничната лента (ако се поддържа от шаблона). Ако оставите полето празно лентата ще бъде изключена';
 $lang['license']               = 'Под какъв лиценз да бъде публикувано съдържанието?';
 $lang['fullpath']              = 'Показване на пълния път до страниците в долния колонтитул.';
 $lang['recent']                = 'Скорошни промени';
@@ -66,12 +86,15 @@ $lang['refcheck']              = 'Проверка за препратка къ
 $lang['refshow']               = 'Брой на показваните медийни препратки';
 $lang['allowdebug']            = 'Включване на режи debug - <b>изключете, ако не е нужен!</b>';
 $lang['mediarevisions']        = 'Да се пазят ли стари версии на качените файлове (Mediarevisions)?';
+
 $lang['usewordblock']          = 'Блокиране на SPAM въз основа на на списък от думи';
 $lang['indexdelay']            = 'Забавяне преди индексиране (сек)';
 $lang['relnofollow']           = 'Ползване на rel="nofollow" за външни препратки';
 $lang['mailguard']             = 'Промяна на адресите на ел. поща (във форма непозволяваща пращането на SPAM)';
 $lang['iexssprotect']          = 'Проверяване на качените файлове за вероятен зловреден JavaScript и HTML код';
 $lang['showuseras']            = 'Какво да се показва за потребителя, който последно е променил страницата';
+
+/* Authentication Options */
 $lang['useacl']                = 'Ползване на списъци за достъп';
 $lang['autopasswd']            = 'Автоматично генериране на пароли, на нови потребители и пращане по пощата';
 $lang['authtype']              = 'Метод за удостоверяване';
@@ -87,8 +110,11 @@ $lang['disableactions_wikicode'] = 'Преглед на кода/Експорт
 $lang['disableactions_other']  = 'Други действия (разделени със запетая)';
 $lang['sneaky_index']          = 'Стандартно DokuWiki ще показва всички именни пространства в индекса. Опцията скрива тези, за които потребителят няма права за четене. Това може да доведе и до скриване на иначе достъпни подименни пространства. С определени настройки на списъците за контрол на достъпа (ACL) може да направи индекса неизползваем. ';
 $lang['auth_security_timeout'] = 'Автоматично проверяване на удостоверяването всеки (сек)';
-$lang['securecookie']          = 'Да се изпращат ли бисквитките зададени чрез HTTPS, само чрез HTTPS от браузъра? Изключете опцията, когато SSL се ползва само за вписване, а четенето е без SSL.
-';
+$lang['securecookie']          = 'Да се изпращат ли бисквитките зададени чрез HTTPS, само чрез HTTPS от браузъра? Изключете опцията, когато SSL се ползва само за вписване, а четенето е без SSL.';
+$lang['remote']                = 'Включване на системата за отдалечен API достъп. Това ще позволи на приложения да се свързват с DokuWiki чрез XML-RPC или друг механизъм.';
+$lang['remoteuser']            = 'Ограничаване на отдалечения API достъп - активиране само за следните групи и потребители (отделени със запетая). Ако оставите полето празно всеки ще има достъп достъп.';
+
+/* Advanced Options */
 $lang['updatecheck']           = 'Проверяване за за нови версии и предупреждения за сигурността? Необходимо е Dokiwiki да може да се свързва със update.dokuwiki.org за тази функционалност.';
 $lang['userewrite']            = 'Ползване на nice URL адреси';
 $lang['useslash']              = 'Ползване на наклонена черта за разделител на именните пространства в URL';
@@ -118,72 +144,104 @@ $lang['send404']               = 'Пращане на "HTTP 404/Page Not Found"
 $lang['sitemap']               = 'Генериране на Google sitemap (дни)';
 $lang['broken_iua']            = 'Отметнете, ако ignore_user_abort функцията не работи. Може да попречи на търсенето в страниците. Знае се, че комбинацията IIS+PHP/CGI е лоша. Вижте  <a href="http://bugs.splitbrain.org/?do=details&task_id=852">Грешка 852</a> за повече информация.';
 $lang['xsendfile']             = 'Ползване на Х-Sendfile header, за да може уебсървъра да дава статични файлове? Вашият уебсървър трябва да го поддържа.';
-$lang['renderer_xhtml']        = 'Представяне на основните изходни данни (xhtml) от wiki-то с';
+$lang['renderer_xhtml']        = 'Представяне на основните изходни данни (xhtml) от Wiki-то с';
 $lang['renderer__core']        = '%s (ядрото на DokuWiki)';
 $lang['renderer__plugin']      = '%s (приставка)';
 $lang['rememberme']            = 'Ползване на постоянни бисквитки за вписване (за функцията "Запомни ме")';
+
 $lang['rss_type']              = 'Тип на XML емисията';
 $lang['rss_linkto']            = 'XML емисията препраща към';
 $lang['rss_content']           = 'Какво да показват елементите на XML емисията?';
 $lang['rss_update']            = 'Интервал на актуализиране на XML емисията (сек)';
 $lang['recent_days']           = 'Колко от скорошните промени да се пазят (дни)';
 $lang['rss_show_summary']      = 'Показване на обобщение в заглавието на XML емисията';
+$lang['rss_media']             = 'Кой тип промени да се включват в XML мисията?';
+
+/* Target options */
 $lang['target____wiki']        = 'Прозорец за вътрешни препратки';
-$lang['target____interwiki']   = 'Прозорец за препратки в wiki-то';
+$lang['target____interwiki']   = 'Прозорец за препратки към други Wiki сайтове';
 $lang['target____extern']      = 'Прозорец за външни препратки';
 $lang['target____media']       = 'Прозорец за медийни препратки';
 $lang['target____windows']     = 'Прозорец за препратки към Windows';
+
+/* Proxy Options */
 $lang['proxy____host']         = 'Име на прокси сървър';
 $lang['proxy____port']         = 'Порт за проксито';
 $lang['proxy____user']         = 'Потребител за проксито';
 $lang['proxy____pass']         = 'Парола за проксито';
 $lang['proxy____ssl']          = 'Ползване на SSL при свързване с проксито';
 $lang['proxy____except']       = 'Регулярен израз определящ за кои URL адреси да не се ползва прокси сървър.';
+
+/* Safemode Hack */
 $lang['safemodehack']          = 'Ползване на хака safemode';
 $lang['ftp____host']           = 'FTP сървър за хака safemode';
 $lang['ftp____port']           = 'FTP порт за хака safemode';
 $lang['ftp____user']           = 'FTP потребител за хака safemode';
 $lang['ftp____pass']           = 'FTP парола за хака safemode';
 $lang['ftp____root']           = 'FTP главна директория за хака safemode';
+
 $lang['license_o_']            = 'Нищо не е избрано';
+
+/* typography options */
 $lang['typography_o_0']        = 'без';
 $lang['typography_o_1']        = 'с изключение на единични кавички';
 $lang['typography_o_2']        = 'включително единични кавички (не винаги работи)';
+
+/* userewrite options */
 $lang['userewrite_o_0']        = 'без';
 $lang['userewrite_o_1']        = 'файлът .htaccess';
 $lang['userewrite_o_2']        = 'вътрешно от DokuWiki ';
+
+/* deaccent options */
 $lang['deaccent_o_0']          = 'изключено';
 $lang['deaccent_o_1']          = 'премахване на акценти';
 $lang['deaccent_o_2']          = 'транслитерация';
+
+/* gdlib options */
 $lang['gdlib_o_0']             = 'GD Lib не е достъпна';
 $lang['gdlib_o_1']             = 'Версия 1.x';
 $lang['gdlib_o_2']             = 'Автоматично разпознаване';
+
+/* rss_type options */
 $lang['rss_type_o_rss']        = 'RSS версия 0.91';
 $lang['rss_type_o_rss1']       = 'RSS версия 1.0';
 $lang['rss_type_o_rss2']       = 'RSS версия 2.0';
 $lang['rss_type_o_atom']       = 'Atom версия 0.3';
 $lang['rss_type_o_atom1']      = 'Atom версия 1.0';
+
+/* rss_content options */
 $lang['rss_content_o_abstract'] = 'Извлечение';
 $lang['rss_content_o_diff']    = 'Обединени разлики';
 $lang['rss_content_o_htmldiff'] = 'Таблица с разликите в HTML формат';
 $lang['rss_content_o_html']    = 'Цялото съдържание на HTML страницата';
+
+/* rss_linkto options */
 $lang['rss_linkto_o_diff']     = 'изглед на разликите';
 $lang['rss_linkto_o_page']     = 'променената страница';
 $lang['rss_linkto_o_rev']      = 'списък на версиите';
 $lang['rss_linkto_o_current']  = 'текущата страница';
+
+/* compression options */
 $lang['compression_o_0']       = 'без';
 $lang['compression_o_gz']      = 'gzip';
 $lang['compression_o_bz2']     = 'bz2';
+
+/* xsendfile header */
 $lang['xsendfile_o_0']         = 'не използвайте';
 $lang['xsendfile_o_1']         = 'Специфичен lighttpd header (преди версия 1.5)';
 $lang['xsendfile_o_2']         = 'Стандартен X-Sendfile header';
 $lang['xsendfile_o_3']         = 'Специфичен Nginx X-Accel-Redirect header за пренасочване';
+
+/* Display user info */
 $lang['showuseras_o_loginname'] = 'Име за вписване';
 $lang['showuseras_o_username'] = 'Пълно потребителско име';
 $lang['showuseras_o_email']    = 'Ел, поща (променени според настройките на mailguard)';
 $lang['showuseras_o_email_link'] = 'Ел. поща под формата на връзка тип mailto:';
+
+/* useheading options */
 $lang['useheading_o_0']        = 'Никога';
 $lang['useheading_o_navigation'] = 'Само за навигация';
 $lang['useheading_o_content']  = 'Само за съдържанието на Wiki-то';
 $lang['useheading_o_1']        = 'Винаги';
+
 $lang['readdircache']          = 'Максимален период за съхраняване кеша на readdir (сек)';
-- 
cgit v1.2.3


From 586bfa91f239ca0bd7d90be35d5d81fb4edaa5d1 Mon Sep 17 00:00:00 2001
From: Tim Roes <mail@timroes.de>
Date: Wed, 4 Apr 2012 21:49:26 +0200
Subject: Changed an error code in XML-RPC interface. This error hasn't
 anything to do with the rest of the -32600 errors.

---
 inc/IXR_Library.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/inc/IXR_Library.php b/inc/IXR_Library.php
index d1e877813..979dc4d16 100644
--- a/inc/IXR_Library.php
+++ b/inc/IXR_Library.php
@@ -440,7 +440,7 @@ EOD;
             $method = $call['methodName'];
             $params = $call['params'];
             if ($method == 'system.multicall') {
-                $result = new IXR_Error(-32600, 'Recursive calls to system.multicall are forbidden');
+                $result = new IXR_Error(-32800, 'Recursive calls to system.multicall are forbidden');
             } else {
                 $result = $this->call($method, $params);
             }
-- 
cgit v1.2.3


From 6e3f46e33d8bcba4e852940d321c8f3741bcc5e5 Mon Sep 17 00:00:00 2001
From: Tim Roes <mail@timroes.de>
Date: Thu, 5 Apr 2012 17:56:44 +0200
Subject: Make getTitle method in remote interface public

---
 inc/RemoteAPICore.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/inc/RemoteAPICore.php b/inc/RemoteAPICore.php
index d8d4d5b7b..546832100 100644
--- a/inc/RemoteAPICore.php
+++ b/inc/RemoteAPICore.php
@@ -44,7 +44,8 @@ class RemoteAPICore {
             ), 'dokuwiki.getTitle' => array(
                 'args' => array(),
                 'return' => 'string',
-                'doc' => 'Returns the wiki title.'
+                'doc' => 'Returns the wiki title.',
+                'public' => '1'
             ), 'dokuwiki.appendPage' => array(
                 'args' => array('string', 'string', 'array'),
                 'return' => 'int',
-- 
cgit v1.2.3


From e5d4768d27336a3af2fc36af663d21a1a57d0ee1 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Sat, 7 Apr 2012 20:20:22 +0200
Subject: added tpl_includeFile() to core

---
 inc/template.php                  | 36 ++++++++++++++++++++++++++++++++++++
 lib/tpl/dokuwiki/detail.php       |  7 +++----
 lib/tpl/dokuwiki/main.php         | 11 +++++------
 lib/tpl/dokuwiki/mediamanager.php |  3 +--
 lib/tpl/dokuwiki/tpl_footer.php   |  2 +-
 lib/tpl/dokuwiki/tpl_header.php   |  2 +-
 6 files changed, 47 insertions(+), 14 deletions(-)

diff --git a/inc/template.php b/inc/template.php
index 37848b59a..edf3ca3fb 100644
--- a/inc/template.php
+++ b/inc/template.php
@@ -1526,6 +1526,42 @@ function tpl_getMediaFile($search, $abs=false, &$imginfo=null){
     return $url;
 }
 
+/**
+ * PHP include a file
+ *
+ * either from the conf directory if it exists, otherwise use
+ * file in the template's root directory.
+ *
+ * The function honours config cascade settings and looks for the given
+ * file next to the ´main´ config files, in the order protected, local,
+ * default.
+ *
+ * Note: no escaping or sanity checking is done here. Never pass user input
+ * to this function!
+ *
+ * @author Anika Henke <anika@selfthinker.org>
+ * @author Andreas Gohr <andi@splitbrain.org>
+ */
+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);
+    }
+}
+
 /**
  * Returns icon from data/media root directory if it exists, otherwise
  * the one in the template's image directory.
diff --git a/lib/tpl/dokuwiki/detail.php b/lib/tpl/dokuwiki/detail.php
index baa454edc..a3516a7ed 100644
--- a/lib/tpl/dokuwiki/detail.php
+++ b/lib/tpl/dokuwiki/detail.php
@@ -9,7 +9,6 @@
 
 // must be run from within DokuWiki
 if (!defined('DOKU_INC')) die();
-@require_once(dirname(__FILE__).'/tpl_functions.php'); /* include hook for template functions */
 
 $showSidebar = $conf['sidebar'] && page_exists($conf['sidebar']) && ($ACT=='show');
 ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
@@ -26,7 +25,7 @@ $showSidebar = $conf['sidebar'] && page_exists($conf['sidebar']) && ($ACT=='show
     <?php tpl_metaheaders()?>
     <meta name="viewport" content="width=device-width,initial-scale=1" />
     <?php echo tpl_favicon(array('favicon', 'mobile')) ?>
-    <?php _tpl_include('meta.html') ?>
+    <?php tpl_includeFile('meta.html') ?>
 </head>
 
 <body>
@@ -47,7 +46,7 @@ $showSidebar = $conf['sidebar'] && page_exists($conf['sidebar']) && ($ACT=='show
 
                 <div class="page group">
                     <?php tpl_flush() ?>
-                    <?php _tpl_include('pageheader.html') ?>
+                    <?php tpl_includeFile('pageheader.html') ?>
                     <!-- detail start -->
                     <?php
                     if($ERROR):
@@ -95,7 +94,7 @@ $showSidebar = $conf['sidebar'] && page_exists($conf['sidebar']) && ($ACT=='show
                     <?php endif; ?>
                 </div>
                 <!-- detail stop -->
-                <?php _tpl_include('pagefooter.html') ?>
+                <?php tpl_includeFile('pagefooter.html') ?>
                 <?php tpl_flush() ?>
 
                 <?php /* doesn't make sense like this; @todo: maybe add tpl_imginfo()?
diff --git a/lib/tpl/dokuwiki/main.php b/lib/tpl/dokuwiki/main.php
index 9bc221711..57c94f174 100644
--- a/lib/tpl/dokuwiki/main.php
+++ b/lib/tpl/dokuwiki/main.php
@@ -9,7 +9,6 @@
  */
 
 if (!defined('DOKU_INC')) die(); /* must be run from within DokuWiki */
-@require_once(dirname(__FILE__).'/tpl_functions.php'); /* include hook for template functions */
 
 $showSidebar = $conf['sidebar'] && page_exists($conf['sidebar']) && ($ACT=='show');
 ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
@@ -23,7 +22,7 @@ $showSidebar = $conf['sidebar'] && page_exists($conf['sidebar']) && ($ACT=='show
     <?php tpl_metaheaders() ?>
     <meta name="viewport" content="width=device-width,initial-scale=1" />
     <?php echo tpl_favicon(array('favicon', 'mobile')) ?>
-    <?php _tpl_include('meta.html') ?>
+    <?php tpl_includeFile('meta.html') ?>
 </head>
 
 <body>
@@ -39,9 +38,9 @@ $showSidebar = $conf['sidebar'] && page_exists($conf['sidebar']) && ($ACT=='show
                 <!-- ********** ASIDE ********** -->
                 <div id="dokuwiki__aside"><div class="pad include group">
                     <?php tpl_flush() ?>
-                    <?php _tpl_include('sidebarheader.html') ?>
+                    <?php tpl_includeFile('sidebarheader.html') ?>
                     <?php tpl_include_page($conf['sidebar']) ?>
-                    <?php _tpl_include('sidebarfooter.html') ?>
+                    <?php tpl_includeFile('sidebarfooter.html') ?>
                 </div></div><!-- /aside -->
             <?php endif; ?>
 
@@ -52,11 +51,11 @@ $showSidebar = $conf['sidebar'] && page_exists($conf['sidebar']) && ($ACT=='show
 
                 <div class="page group">
                     <?php tpl_flush() ?>
-                    <?php _tpl_include('pageheader.html') ?>
+                    <?php tpl_includeFile('pageheader.html') ?>
                     <!-- wikipage start -->
                     <?php tpl_content() ?>
                     <!-- wikipage stop -->
-                    <?php _tpl_include('pagefooter.html') ?>
+                    <?php tpl_includeFile('pagefooter.html') ?>
                 </div>
 
                 <div class="docInfo"><?php tpl_pageinfo() ?></div>
diff --git a/lib/tpl/dokuwiki/mediamanager.php b/lib/tpl/dokuwiki/mediamanager.php
index 0651b448d..1f3b9661b 100644
--- a/lib/tpl/dokuwiki/mediamanager.php
+++ b/lib/tpl/dokuwiki/mediamanager.php
@@ -7,7 +7,6 @@
  */
 // must be run from within DokuWiki
 if (!defined('DOKU_INC')) die();
-@require_once(dirname(__FILE__).'/tpl_functions.php'); /* include hook for template functions */
 
 ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
@@ -23,7 +22,7 @@ if (!defined('DOKU_INC')) die();
     <?php tpl_metaheaders()?>
     <meta name="viewport" content="width=device-width,initial-scale=1" />
     <?php echo tpl_favicon(array('favicon', 'mobile')) ?>
-    <?php _tpl_include('meta.html') ?>
+    <?php tpl_includeFile('meta.html') ?>
 </head>
 
 <body>
diff --git a/lib/tpl/dokuwiki/tpl_footer.php b/lib/tpl/dokuwiki/tpl_footer.php
index 6b46234d6..41ddabda2 100644
--- a/lib/tpl/dokuwiki/tpl_footer.php
+++ b/lib/tpl/dokuwiki/tpl_footer.php
@@ -20,4 +20,4 @@
     </div>
 </div></div><!-- /footer -->
 
-<?php _tpl_include('footer.html') ?>
+<?php tpl_includeFile('footer.html') ?>
diff --git a/lib/tpl/dokuwiki/tpl_header.php b/lib/tpl/dokuwiki/tpl_header.php
index 35b3cf636..1d2517ee1 100644
--- a/lib/tpl/dokuwiki/tpl_header.php
+++ b/lib/tpl/dokuwiki/tpl_header.php
@@ -2,7 +2,7 @@
 <div id="dokuwiki__header"><div class="pad group">
 
     <?php html_msgarea() ?>
-    <?php _tpl_include('header.html') ?>
+    <?php tpl_includeFile('header.html') ?>
 
     <div class="headings group">
         <ul class="a11y skip">
-- 
cgit v1.2.3


From 0bf9967d124e9bd2b91b4f580ac99e1e981e36b9 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Sat, 7 Apr 2012 20:21:06 +0200
Subject: removed obsolete template file

---
 lib/tpl/dokuwiki/tpl_functions.php | 30 ------------------------------
 1 file changed, 30 deletions(-)
 delete mode 100644 lib/tpl/dokuwiki/tpl_functions.php

diff --git a/lib/tpl/dokuwiki/tpl_functions.php b/lib/tpl/dokuwiki/tpl_functions.php
deleted file mode 100644
index c024f33e7..000000000
--- a/lib/tpl/dokuwiki/tpl_functions.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-/**
- * Template Functions
- *
- * This file provides template specific custom functions that are
- * not provided by the DokuWiki core.
- * It is common practice to start each function with an underscore
- * to make sure it won't interfere with future core functions.
- */
-
-// must be run from within DokuWiki
-if (!defined('DOKU_INC')) die();
-
-/* @todo: add this function to the core and delete this file */
-
-/**
- * Include additional html file from conf directory if it exists, otherwise use
- * file in the template's root directory.
- *
- * @author Anika Henke <anika@selfthinker.org>
- */
-function _tpl_include($fn) {
-    $confFile = DOKU_CONF.$fn;
-    $tplFile  = dirname(__FILE__).'/'.$fn;
-
-    if (file_exists($confFile))
-        include($confFile);
-    else if (file_exists($tplFile))
-        include($tplFile);
-}
-- 
cgit v1.2.3


From f3a1225fae9b5d3b72f691efd61a993c92c0d581 Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Sat, 7 Apr 2012 22:12:29 +0100
Subject: removed comments from accidentally commented lines in
 tpl_includeFile()

---
 inc/template.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/inc/template.php b/inc/template.php
index edf3ca3fb..27163f076 100644
--- a/inc/template.php
+++ b/inc/template.php
@@ -1549,7 +1549,7 @@ function tpl_includeFile($file){
         foreach ($config_cascade['main'][$config_group] as $conf_file) {
             $dir = dirname($conf_file);
             if(file_exists("$dir/$file")){
-         //       include("$dir/$file");
+                include("$dir/$file");
                 return;
             }
         }
@@ -1558,7 +1558,7 @@ function tpl_includeFile($file){
     // still here? try the template dir
     $file = tpl_incdir().$file;
     if(file_exists($file)){
-        //include($file);
+        include($file);
     }
 }
 
-- 
cgit v1.2.3


From dbd59867496d5e3c5d37e9c3852db29a6a2370c4 Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Sat, 7 Apr 2012 22:24:18 +0100
Subject: removed all browser-specific gradients as the recently (in 42ff6730)
 introduced svg makes them unnecessary

---
 lib/tpl/dokuwiki/css/basic.css | 20 ++++----------------
 1 file changed, 4 insertions(+), 16 deletions(-)

diff --git a/lib/tpl/dokuwiki/css/basic.css b/lib/tpl/dokuwiki/css/basic.css
index dce632b9a..c8e0c435e 100644
--- a/lib/tpl/dokuwiki/css/basic.css
+++ b/lib/tpl/dokuwiki/css/basic.css
@@ -17,11 +17,7 @@ body {
     color: __text__;
     background-color: __background_site__;
     background-image: url(images/page-background.svg);
-    /*background-image: -moz-linear-gradient(   top, __background_neu__ 0%, __background_alt__ 1em, __background_site__ 4em); see FS#2447*/
-    background-image: -webkit-linear-gradient(top, __background_neu__ 0%, __background_alt__ 1em, __background_site__ 4em);
-    background-image: -o-linear-gradient(     top, __background_neu__ 0%, __background_alt__ 1em, __background_site__ 4em);
-    background-image: -ms-linear-gradient(    top, __background_neu__ 0%, __background_alt__ 1em, __background_site__ 4em);
-    background-image: linear-gradient(        top, __background_neu__ 0%, __background_alt__ 1em, __background_site__ 4em);
+    background-image: linear-gradient( top, __background_neu__ 0%, __background_alt__ 1em, __background_site__ 4em);
     background-size: 1px 10em;
     background-repeat: repeat-x;
     margin: 0;
@@ -335,11 +331,7 @@ button,
     color: #333;
     background-color: #eee;
     background-image: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIHZpZXdCb3g9IjAgMCAxIDEiIHByZXNlcnZlQXNwZWN0UmF0aW89Im5vbmUiPgo8bGluZWFyR3JhZGllbnQgaWQ9Imc4MjQiIGdyYWRpZW50VW5pdHM9InVzZXJTcGFjZU9uVXNlIiB4MT0iMCUiIHkxPSIwJSIgeDI9IjAlIiB5Mj0iMTAwJSI+CjxzdG9wIHN0b3AtY29sb3I9IiNGRkZGRkYiIG9mZnNldD0iMCIvPjxzdG9wIHN0b3AtY29sb3I9IiNGNEY0RjQiIG9mZnNldD0iMC4zIi8+PHN0b3Agc3RvcC1jb2xvcj0iI0VFRUVFRSIgb2Zmc2V0PSIwLjk5Ii8+PHN0b3Agc3RvcC1jb2xvcj0iI0NDQ0NDQyIgb2Zmc2V0PSIuOTkiLz4KPC9saW5lYXJHcmFkaWVudD4KPHJlY3QgeD0iMCIgeT0iMCIgd2lkdGg9IjEiIGhlaWdodD0iMSIgZmlsbD0idXJsKCNnODI0KSIgLz4KPC9zdmc+);
-    /*background: -moz-linear-gradient(   top, #ffffff 0%, #f4f4f4 30%, #eeeeee 99%, #cccccc 99%); see FS#2447*/
-    background: -webkit-linear-gradient(top, #ffffff 0%, #f4f4f4 30%, #eeeeee 99%, #cccccc 99%);
-    background: -o-linear-gradient(     top, #ffffff 0%, #f4f4f4 30%, #eeeeee 99%, #cccccc 99%);
-    background: -ms-linear-gradient(    top, #ffffff 0%, #f4f4f4 30%, #eeeeee 99%, #cccccc 99%);
-    background: linear-gradient(        top, #ffffff 0%, #f4f4f4 30%, #eeeeee 99%, #cccccc 99%);
+    background: linear-gradient( top, #ffffff 0%, #f4f4f4 30%, #eeeeee 99%, #cccccc 99%);
     border: 1px solid #ccc;
     border-radius: 2px;
     padding: .1em .5em;
@@ -361,12 +353,8 @@ button:focus,
 .qq-upload-button:hover {
     border-color: #999;
     background-color: #ddd;
-    background-image:url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIHZpZXdCb3g9IjAgMCAxIDEiIHByZXNlcnZlQXNwZWN0UmF0aW89Im5vbmUiPgo8bGluZWFyR3JhZGllbnQgaWQ9Imc2NzAiIGdyYWRpZW50VW5pdHM9InVzZXJTcGFjZU9uVXNlIiB4MT0iMCUiIHkxPSIwJSIgeDI9IjAlIiB5Mj0iMTAwJSI+CjxzdG9wIHN0b3AtY29sb3I9IiNGRkZGRkYiIG9mZnNldD0iMCIvPjxzdG9wIHN0b3AtY29sb3I9IiNGNEY0RjQiIG9mZnNldD0iMC4zIi8+PHN0b3Agc3RvcC1jb2xvcj0iI0RERERERCIgb2Zmc2V0PSIwLjk5Ii8+PHN0b3Agc3RvcC1jb2xvcj0iI0JCQkJCQiIgb2Zmc2V0PSIuOTkiLz4KPC9saW5lYXJHcmFkaWVudD4KPHJlY3QgeD0iMCIgeT0iMCIgd2lkdGg9IjEiIGhlaWdodD0iMSIgZmlsbD0idXJsKCNnNjcwKSIgLz4KPC9zdmc+);
-    /*background: -moz-linear-gradient(   top, #ffffff 0%, #f4f4f4 30%, #dddddd 99%, #cccccc 99%); see FS#2447*/
-    background: -webkit-linear-gradient(top, #ffffff 0%, #f4f4f4 30%, #dddddd 99%, #bbbbbb 99%);
-    background: -o-linear-gradient(     top, #ffffff 0%, #f4f4f4 30%, #dddddd 99%, #bbbbbb 99%);
-    background: -ms-linear-gradient(    top, #ffffff 0%, #f4f4f4 30%, #dddddd 99%, #bbbbbb 99%);
-    background: linear-gradient(        top, #ffffff 0%, #f4f4f4 30%, #dddddd 99%, #bbbbbb 99%);
+    background-image: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIHZpZXdCb3g9IjAgMCAxIDEiIHByZXNlcnZlQXNwZWN0UmF0aW89Im5vbmUiPgo8bGluZWFyR3JhZGllbnQgaWQ9Imc2NzAiIGdyYWRpZW50VW5pdHM9InVzZXJTcGFjZU9uVXNlIiB4MT0iMCUiIHkxPSIwJSIgeDI9IjAlIiB5Mj0iMTAwJSI+CjxzdG9wIHN0b3AtY29sb3I9IiNGRkZGRkYiIG9mZnNldD0iMCIvPjxzdG9wIHN0b3AtY29sb3I9IiNGNEY0RjQiIG9mZnNldD0iMC4zIi8+PHN0b3Agc3RvcC1jb2xvcj0iI0RERERERCIgb2Zmc2V0PSIwLjk5Ii8+PHN0b3Agc3RvcC1jb2xvcj0iI0JCQkJCQiIgb2Zmc2V0PSIuOTkiLz4KPC9saW5lYXJHcmFkaWVudD4KPHJlY3QgeD0iMCIgeT0iMCIgd2lkdGg9IjEiIGhlaWdodD0iMSIgZmlsbD0idXJsKCNnNjcwKSIgLz4KPC9zdmc+);
+    background: linear-gradient( top, #ffffff 0%, #f4f4f4 30%, #dddddd 99%, #bbbbbb 99%);
 }
 
 input::-moz-focus-inner,
-- 
cgit v1.2.3


From 79504989f948613597d5516c9b31ba7e1529a303 Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Mon, 9 Apr 2012 19:49:03 +0100
Subject: moved plugins' rtl.css to their style.css counterpart (part of
 FS#2185)

---
 lib/plugins/acl/rtl.css      | 40 ----------------------------------
 lib/plugins/acl/style.css    | 31 +++++++++++++++++++++++++++
 lib/plugins/config/rtl.css   | 45 --------------------------------------
 lib/plugins/config/style.css | 36 +++++++++++++++++++++++++++++++
 lib/plugins/plugin/rtl.css   | 51 --------------------------------------------
 lib/plugins/plugin/style.css | 39 +++++++++++++++++++++++++++++++++
 6 files changed, 106 insertions(+), 136 deletions(-)
 delete mode 100644 lib/plugins/acl/rtl.css
 delete mode 100644 lib/plugins/config/rtl.css
 delete mode 100644 lib/plugins/plugin/rtl.css

diff --git a/lib/plugins/acl/rtl.css b/lib/plugins/acl/rtl.css
deleted file mode 100644
index e79abe596..000000000
--- a/lib/plugins/acl/rtl.css
+++ /dev/null
@@ -1,40 +0,0 @@
-div#acl_manager div#acl__tree {
-    float: right;
-    text-align: right;
-}
-
-div#acl_manager div#acl__tree li {
-    padding-left: 0em;
-    padding-right: 1em;
-}
-
-div#acl_manager div#acl__tree ul img {
-    margin-left: 0.25em;
-    margin-right: 0em;
-}
-
-
-div#acl_manager div#acl__detail {
-    float: left;
-}
-
-div#acl_manager .aclgroup {
-    background: transparent url(pix/group.png) right 1px no-repeat;
-    padding: 1px 18px 1px 0px;
-}
-
-div#acl_manager .acluser {
-    background: transparent url(pix/user.png) right 1px no-repeat;
-    padding: 1px 18px 1px 0px;
-}
-
-div#acl_manager .aclpage {
-    background: transparent url(pix/page.png) right 1px no-repeat;
-    padding: 1px 18px 1px 0px;
-}
-
-div#acl_manager .aclns {
-    background: transparent url(pix/ns.png) right 1px no-repeat;
-    padding: 1px 18px 1px 0px;
-}
-
diff --git a/lib/plugins/acl/style.css b/lib/plugins/acl/style.css
index b7154aa78..2eee4f41c 100644
--- a/lib/plugins/acl/style.css
+++ b/lib/plugins/acl/style.css
@@ -8,6 +8,10 @@ div#acl_manager div#acl__tree {
     border: 1px solid __border__;
     text-align: left;
 }
+[dir=rtl] div#acl_manager div#acl__tree {
+    float: right;
+    text-align: right;
+}
 
 div#acl_manager div#acl__tree a.cur {
     background-color: __highlight__;
@@ -24,11 +28,19 @@ div#acl_manager div#acl__tree li {
     padding-left: 1em;
     list-style-image: none;
 }
+[dir=rtl] div#acl_manager div#acl__tree li {
+    padding-left: 0em;
+    padding-right: 1em;
+}
 
 div#acl_manager div#acl__tree ul img {
     margin-right: 0.25em;
     cursor: pointer;
 }
+[dir=rtl] div#acl_manager div#acl__tree ul img {
+    margin-left: 0.25em;
+    margin-right: 0em;
+}
 
 div#acl_manager div#acl__detail {
     width: 73%;
@@ -36,6 +48,9 @@ div#acl_manager div#acl__detail {
     float: right;
     overflow: auto;
 }
+[dir=rtl] div#acl_manager div#acl__detail {
+    float: left;
+}
 
 div#acl_manager div#acl__detail fieldset {
     width: 90%;
@@ -56,21 +71,37 @@ div#acl_manager .aclgroup {
     background: transparent url(pix/group.png) 0px 1px no-repeat;
     padding: 1px 0px 1px 18px;
 }
+[dir=rtl] div#acl_manager .aclgroup {
+    background: transparent url(pix/group.png) right 1px no-repeat;
+    padding: 1px 18px 1px 0px;
+}
 
 div#acl_manager .acluser {
     background: transparent url(pix/user.png) 0px 1px no-repeat;
     padding: 1px 0px 1px 18px;
 }
+[dir=rtl] div#acl_manager .acluser {
+    background: transparent url(pix/user.png) right 1px no-repeat;
+    padding: 1px 18px 1px 0px;
+}
 
 div#acl_manager .aclpage {
     background: transparent url(pix/page.png) 0px 1px no-repeat;
     padding: 1px 0px 1px 18px;
 }
+[dir=rtl] div#acl_manager .aclpage {
+    background: transparent url(pix/page.png) right 1px no-repeat;
+    padding: 1px 18px 1px 0px;
+}
 
 div#acl_manager .aclns {
     background: transparent url(pix/ns.png) 0px 1px no-repeat;
     padding: 1px 0px 1px 18px;
 }
+[dir=rtl] div#acl_manager .aclns {
+    background: transparent url(pix/ns.png) right 1px no-repeat;
+    padding: 1px 18px 1px 0px;
+}
 
 div#acl_manager label.disabled {
   color: __text_neu__!important;
diff --git a/lib/plugins/config/rtl.css b/lib/plugins/config/rtl.css
deleted file mode 100644
index b8b9660e2..000000000
--- a/lib/plugins/config/rtl.css
+++ /dev/null
@@ -1,45 +0,0 @@
-#config__manager fieldset {
-    clear: both;
-}
-
-#config__manager fieldset td {
-    text-align: right;
-}
-
-#config__manager label {
-    text-align: right;
-}
-
-#config__manager td.value input.checkbox {
-    float: right;
-    padding-left: 0;
-    padding-right: 0.7em;
-}
-
-#config__manager td.value label {
-    float: left;
-}
-
-#config__manager td.label {
-    padding: 0.8em 1em 0.6em 0;
-}
-
-#config__manager td.label span.outkey {
-    float: right;
-    margin-right: 1em;
-}
-
-#config__manager td.label label {
-    clear: right;
-}
-
-#config__manager td.label img {
-    float: left;
-}
-
-#config__manager .selection {
-  width: 14.8em;
-  float: right;
-  margin: 0 0 2px 0.3em;
-}
-
diff --git a/lib/plugins/config/style.css b/lib/plugins/config/style.css
index 65c44a758..1be94feb9 100644
--- a/lib/plugins/config/style.css
+++ b/lib/plugins/config/style.css
@@ -15,6 +15,9 @@
   color: __text__;
   padding: 0 1em;
 }
+[dir=rtl] #config__manager fieldset {
+    clear: both;
+}
 #config__manager legend {
     font-size: 1.25em;
 }
@@ -28,25 +31,49 @@
 #config__manager fieldset td {
     text-align: left;
 }
+[dir=rtl] #config__manager fieldset td {
+    text-align: right;
+}
 #config__manager fieldset td.value {
     /* fixed data column width */
     width: 31em;
 }
 
+[dir=rtl] #config__manager label {
+    text-align: right;
+}
+[dir=rtl] #config__manager td.value input.checkbox {
+    float: right;
+    padding-left: 0;
+    padding-right: 0.7em;
+}
+[dir=rtl] #config__manager td.value label {
+    float: left;
+}
+
 #config__manager td.label {
     padding: 0.8em 0 0.6em 1em;
     vertical-align: top;
 }
+[dir=rtl] #config__manager td.label {
+    padding: 0.8em 1em 0.6em 0;
+}
 
 #config__manager td.label label {
     clear: left;
     display: block;
 }
+[dir=rtl] #config__manager td.label label {
+    clear: right;
+}
 #config__manager td.label img {
     padding: 0 10px;
     vertical-align: middle;
     float: right;
 }
+[dir=rtl] #config__manager td.label img {
+    float: left;
+}
 
 #config__manager td.label span.outkey {
     font-size: 70%;
@@ -60,6 +87,10 @@
     position: relative;
     z-index: 1;
 }
+[dir=rtl] #config__manager td.label span.outkey {
+    float: right;
+    margin-right: 1em;
+}
 
 #config__manager td input.edit {
     width: 30em;
@@ -106,6 +137,11 @@
   float: left;
   margin: 0 0.3em 2px 0;
 }
+[dir=rtl] #config__manager .selection {
+  width: 14.8em;
+  float: right;
+  margin: 0 0 2px 0.3em;
+}
 
 #config__manager .selection label {
   float: right;
diff --git a/lib/plugins/plugin/rtl.css b/lib/plugins/plugin/rtl.css
deleted file mode 100644
index 6ababd8e0..000000000
--- a/lib/plugins/plugin/rtl.css
+++ /dev/null
@@ -1,51 +0,0 @@
-
-#plugin__manager .pm_menu,
-#plugin__manager .pm_info,
-#plugin__manager p,
-#plugin__manager label {
-    text-align: right;
-}
-
-#plugin__manager .pm_menu {
-    float: right;
-}
-
-#plugin__manager .pm_info {
-    float: left;
-}
-
-#plugin__manager .pm_info dt {
-    float: right;
-    clear: right;
-}
-
-#plugin__manager .pm_info dd {
-    margin: 0 7em 0 0;
-}
-
-#plugin__manager .common fieldset {
-    text-align: right;
-}
-
-
-#plugin__manager .plugins .legend {
-    text-align: right;
-    float: right;
-}
-
-#plugin__manager .plugins .enable {
-    float: right;
-    margin-right: 0;
-    margin-left: 0.5em;
-}
-
-#plugin__manager .plugins .button {
-    float: left;
-    margin-right: 0.5em;
-}
-
-
-#plugin__manager .plugins fieldset.buttons .button {
-    float: right;
-}
-
diff --git a/lib/plugins/plugin/style.css b/lib/plugins/plugin/style.css
index de6cca579..9433e6001 100644
--- a/lib/plugins/plugin/style.css
+++ b/lib/plugins/plugin/style.css
@@ -52,15 +52,28 @@
     text-align: left;
 }
 
+[dir=rtl] #plugin__manager .pm_menu,
+[dir=rtl] #plugin__manager .pm_info,
+[dir=rtl] #plugin__manager p,
+[dir=rtl] #plugin__manager label {
+    text-align: right;
+}
+
 #plugin__manager .pm_menu {
     float: left;
     width: 48%;
 }
+[dir=rtl] #plugin__manager .pm_menu {
+    float: right;
+}
 
 #plugin__manager .pm_info {
     float: right;
     width: 50%;
 }
+[dir=rtl] #plugin__manager .pm_info {
+    float: left;
+}
 
 #plugin__manager .common fieldset {
     margin: 0;
@@ -68,6 +81,9 @@
     text-align: left;
     border: none;
 }
+[dir=rtl] #plugin__manager .common fieldset {
+    text-align: right;
+}
 
 #plugin__manager .common label {
     padding: 0 0 0.5em 0;
@@ -111,6 +127,10 @@
     padding: 0;
     clear: none;
 }
+[dir=rtl] #plugin__manager .plugins .legend {
+    text-align: right;
+    float: right;
+}
 
 #plugin__manager .plugins .button {
     font-size: 95%;
@@ -123,6 +143,13 @@
 #plugin__manager .plugins fieldset.buttons .button {
     float: left;
 }
+[dir=rtl] #plugin__manager .plugins .button {
+    float: left;
+    margin-right: 0.5em;
+}
+[dir=rtl] #plugin__manager .plugins fieldset.buttons .button {
+    float: right;
+}
 
 #plugin__manager .pm_info h3 {
     margin-left: 0;
@@ -140,17 +167,29 @@
     margin: 0;
     padding: 0;
 }
+[dir=rtl] #plugin__manager .pm_info dt {
+    float: right;
+    clear: right;
+}
 
 #plugin__manager .pm_info dd {
     margin: 0 0 0 7em;
     padding: 0;
     background: none;
 }
+[dir=rtl] #plugin__manager .pm_info dd {
+    margin: 0 7em 0 0;
+}
 
 #plugin__manager .plugins .enable {
     float: left;
     width: auto;
     margin-right: 0.5em;
 }
+[dir=rtl] #plugin__manager .plugins .enable {
+    float: right;
+    margin-right: 0;
+    margin-left: 0.5em;
+}
 
 /* end admin plugin styles */
-- 
cgit v1.2.3


From 47260a57d569ff440e40a675d0afde195befbfcd Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Mon, 9 Apr 2012 19:52:06 +0100
Subject: added minimal RTL print styles (part of FS#2185)

---
 lib/tpl/dokuwiki/css/print.css | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/lib/tpl/dokuwiki/css/print.css b/lib/tpl/dokuwiki/css/print.css
index f4f81d741..58b8a5f0d 100644
--- a/lib/tpl/dokuwiki/css/print.css
+++ b/lib/tpl/dokuwiki/css/print.css
@@ -137,6 +137,9 @@ div.clearer {
     border: solid #ccc;
     border-width: 0 0 0 2pt;
 }
+[dir=rtl] .dokuwiki blockquote {
+    border-width: 0 2pt 0 0;
+}
 
 /* tables */
 .dokuwiki table {
@@ -153,6 +156,10 @@ div.clearer {
     border: 1pt solid #666;
     text-align: left;
 }
+[dir=rtl] .dokuwiki th,
+[dir=rtl] .dokuwiki td {
+    text-align: right;
+}
 .dokuwiki th {
     font-weight: bold;
 }
@@ -173,6 +180,11 @@ div.clearer {
     float: left;
     margin-right: .5em;
 }
+[dir=rtl] #dokuwiki__header h1 img {
+    float: right;
+    margin-right: 0;
+    margin-left: .5em;
+}
 .dokuwiki div.footnotes {
     clear: both;
     border-top: 1pt solid #000;
-- 
cgit v1.2.3


From bd28ae8066c753421603f70737fa91fa9697ec58 Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Mon, 9 Apr 2012 19:54:20 +0100
Subject: when there's not enough space for images, make sure they stay
 proportional (might be FS#2480)

---
 lib/tpl/dokuwiki/css/basic.css | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/tpl/dokuwiki/css/basic.css b/lib/tpl/dokuwiki/css/basic.css
index c8e0c435e..7ffe42ec4 100644
--- a/lib/tpl/dokuwiki/css/basic.css
+++ b/lib/tpl/dokuwiki/css/basic.css
@@ -195,6 +195,7 @@ img {
 img,
 object {
     max-width: 100%;
+    height: auto;
 }
 
 hr {
-- 
cgit v1.2.3


From bed6e6e5baa092db263210240784e7e640729579 Mon Sep 17 00:00:00 2001
From: Usama Akkad <uahello@gmail.com>
Date: Wed, 11 Apr 2012 23:02:09 +0200
Subject: Arabic Language Update

---
 inc/lang/ar/lang.php                | 54 ++++++++++++++++++++++++++++++++++++-
 inc/lang/ar/resetpwd.txt            |  3 +++
 lib/plugins/config/lang/ar/lang.php | 11 ++++++++
 lib/plugins/plugin/lang/ar/lang.php |  1 +
 4 files changed, 68 insertions(+), 1 deletion(-)
 create mode 100644 inc/lang/ar/resetpwd.txt

diff --git a/inc/lang/ar/lang.php b/inc/lang/ar/lang.php
index af92243c9..350e26695 100644
--- a/inc/lang/ar/lang.php
+++ b/inc/lang/ar/lang.php
@@ -42,11 +42,14 @@ $lang['btn_backtomedia']       = 'ارجع إلى اختيار ملف الوسا
 $lang['btn_subscribe']         = 'ادر الاشتراكات';
 $lang['btn_profile']           = 'حدث الملف الشخصي';
 $lang['btn_reset']             = 'صفّر';
+$lang['btn_resendpwd']         = 'اضبط كلمة سر جديدة';
 $lang['btn_draft']             = 'حرر المسودة';
 $lang['btn_recover']           = 'استرجع المسودة';
 $lang['btn_draftdel']          = 'احذف المسوّدة';
 $lang['btn_revert']            = 'استعد';
 $lang['btn_register']          = 'سجّل';
+$lang['btn_apply']             = 'طبق';
+$lang['btn_media']             = 'مدير الوسائط';
 $lang['loggedinas']            = 'داخل باسم';
 $lang['user']                  = 'اسم المستخدم';
 $lang['pass']                  = 'كلمة السر';
@@ -76,6 +79,7 @@ $lang['profnoempty']           = 'غير مسموح باسم مستخدم أو 
 $lang['profchanged']           = 'حُدث الملف الشخصي للمستخدم بنجاح.';
 $lang['pwdforget']             = 'أنسيت كلمة السر؟ احصل على واحدة جديدة';
 $lang['resendna']              = 'هذه الويكي لا تدعم إعادة إرسال كلمة المرور.';
+$lang['resendpwd']             = 'اضبط كلمة سر جديدة لـ';
 $lang['resendpwdmissing']      = 'عذراّ، يجب أن تملأ كل الحقول.';
 $lang['resendpwdnouser']       = 'عذراً، لم نجد المستخدم هذا في قاعدة بياناتنا.';
 $lang['resendpwdbadauth']      = 'عذراً، رمز التفعيل هذا غير صحيح. نأكد من استخدامك كامل وصلة التأكيد.';
@@ -90,7 +94,7 @@ $lang['txt_filename']          = 'رفع كـ (اختياري)';
 $lang['txt_overwrt']           = 'اكتب على ملف موجود';
 $lang['lockedby']              = 'مقفلة حاليا لـ';
 $lang['lockexpire']            = 'ينتهي القفل في';
-$lang['js']['willexpire']            = 'سينتهي قفل تحرير هذه الصفحه خلال دقيقة.\nلتجنب التعارض استخدم زر المعاينة لتصفير مؤقت القفل.';
+$lang['js']['willexpire']      = 'سينتهي قفل تحرير هذه الصفحه خلال دقيقة.\nلتجنب التعارض استخدم زر المعاينة لتصفير مؤقت القفل.';
 $lang['js']['notsavedyet']     = 'التعديلات غير المحفوظة ستفقد.';
 $lang['js']['searchmedia']     = 'ابحث عن ملفات';
 $lang['js']['keepopen']        = 'أبقي النافذة مفتوحة أثناء الاختيار';
@@ -121,6 +125,17 @@ $lang['js']['nosmblinks']      = 'الروابط لمجلدات مشاركة و
 $lang['js']['linkwiz']         = 'مرشد الروابط';
 $lang['js']['linkto']          = 'الرابط إلى :';
 $lang['js']['del_confirm']     = 'هل حقاً تريد حذف البنود المختارة؟';
+$lang['js']['restore_confirm'] = 'أمتأكد من استرجاع هذه النسخة؟';
+$lang['js']['media_diff']      = 'عرض الفروق:';
+$lang['js']['media_diff_both'] = 'جنبا إلى جنب';
+$lang['js']['media_diff_opacity'] = 'Shine-through';
+$lang['js']['media_diff_portions'] = 'Swipe';
+$lang['js']['media_select']    = 'اختر ملفا...';
+$lang['js']['media_upload_btn'] = 'ارفع';
+$lang['js']['media_done_btn']  = 'تم';
+$lang['js']['media_drop']      = 'اسقط الملف هنا لرفعه';
+$lang['js']['media_cancel']    = 'أزل';
+$lang['js']['media_overwrt']   = 'أكتب فوق الملفات الموجودة';
 $lang['rssfailed']             = 'خطأ ما حدث أثناء جلب ملف التغذية:';
 $lang['nothingfound']          = 'لا يوجد شيء';
 $lang['mediaselect']           = 'ملفات الوسائط';
@@ -170,11 +185,20 @@ $lang['external_edit']         = 'تحرير خارجي';
 $lang['summary']               = 'ملخص التحرير';
 $lang['noflash']               = 'تحتاج إلى<a href="http://www.adobe.com/products/flashplayer/">ملحق فلاش أدوبي</a> لعرض هذا المحتوى.';
 $lang['download']              = 'نزل Snippet';
+$lang['tools']                 = 'أدوات';
+$lang['user_tools']            = 'أدوات المستخدم';
+$lang['site_tools']            = 'أدوات الموقع';
+$lang['page_tools']            = 'أدوات الصفحة';
+$lang['skip_to_content']       = 'تجاوز إلى المحتوى';
 $lang['mail_newpage']          = 'إضافة صفحة:';
 $lang['mail_changed']          = 'تعديل صفحة:';
 $lang['mail_subscribe_list']   = 'صفحات غيرت في النطاق:';
 $lang['mail_new_user']         = 'مشترك جديد:';
 $lang['mail_upload']           = 'رفع ملف:';
+$lang['changes_type']          = 'أظهر تغييرات الـ';
+$lang['pages_changes']         = 'صفحات';
+$lang['media_changes']         = 'ملفات الوسائط';
+$lang['both_changes']          = 'كلا من الصفحات وملفات الوسائط';
 $lang['qb_bold']               = 'نص عريض';
 $lang['qb_italic']             = 'نص مائل';
 $lang['qb_underl']             = 'نص مسطر';
@@ -215,6 +239,9 @@ $lang['img_copyr']             = 'حقوق النسخ';
 $lang['img_format']            = 'الهيئة';
 $lang['img_camera']            = 'الكمرا';
 $lang['img_keywords']          = 'كلمات مفتاحية';
+$lang['img_width']             = 'العرض';
+$lang['img_height']            = 'الإرتفاع';
+$lang['img_manager']           = 'اعرض في مدير الوسائط';
 $lang['subscr_subscribe_success'] = 'اضيف %s لقائمة اشتراك %s';
 $lang['subscr_subscribe_error'] = 'خطأ في إضافة %s لقائمة اشتراك %s';
 $lang['subscr_subscribe_noaddress'] = 'ليس هناك عنوان مرتبط بولوجك، لا يمكن اضافتك لقائمة الاشتراك';
@@ -233,6 +260,7 @@ $lang['subscr_style_digest']   = 'بريد ملخص عن تغييرات كل ص
 $lang['subscr_style_list']     = 'قائمة بالصفحات المتغيرة منذ آخر بريد';
 $lang['authmodfailed']         = 'إعدادات تصريح فاسدة، يرجى مراسلة المدير.';
 $lang['authtempfail']          = 'تصريح المشترك غير متوفر مؤقتاً، إن استمرت هذه الحالة يرجى مراسلة المدير';
+$lang['authpwdexpire']         = 'ستنتهي صلاحية كلمة السر في %d . عليك بتغييرها سريعا.';
 $lang['i_chooselang']          = 'اختر لغتك';
 $lang['i_installer']           = 'برنامج تنصيب دوكو ويكي';
 $lang['i_wikiname']            = 'اسم الويكي';
@@ -273,3 +301,27 @@ $lang['hours']                 = '%d ساعة مضت';
 $lang['minutes']               = '%d دقيقة مضت';
 $lang['seconds']               = '%d ثانية مضت';
 $lang['wordblock']             = 'لم تحفظ تغييراتك لاحتوائها على نص ممنوع )غثاء(';
+$lang['media_uploadtab']       = 'ارفع';
+$lang['media_searchtab']       = 'ابحث';
+$lang['media_file']            = 'ملف';
+$lang['media_viewtab']         = 'عرض';
+$lang['media_edittab']         = 'تحرير';
+$lang['media_historytab']      = 'التاريخ';
+$lang['media_list_thumbs']     = 'المصغرات';
+$lang['media_list_rows']       = 'صفوف';
+$lang['media_sort_name']       = 'الاسم';
+$lang['media_sort_date']       = 'التاريخ';
+$lang['media_namespaces']      = 'اختر نطاقا';
+$lang['media_files']           = 'الملفات في %s';
+$lang['media_upload']          = 'ارفع إلى %s';
+$lang['media_search']          = 'ابحث في %s';
+$lang['media_view']            = '%s';
+$lang['media_viewold']         = '%s في %s';
+$lang['media_edit']            = 'حرر %s';
+$lang['media_history']         = 'تاريخ %s';
+$lang['media_meta_edited']     = 'عُدلت الميتاداتا';
+$lang['media_perm_read']       = 'عفوا، لست مخولا بقراءة الملفات.';
+$lang['media_perm_upload']     = 'عفوا، لست مخولا برفع الملفات.';
+$lang['media_update']          = 'ارفع إصدارا أحدث';
+$lang['media_restore']         = 'استرجع هذه النسخة';
+$lang['plugin_install_err']    = 'ثبتت الإضافة بشكل خاطئ. أعد تسمية دليل الإضافة \'%s\' إلى \'%s\'.';
diff --git a/inc/lang/ar/resetpwd.txt b/inc/lang/ar/resetpwd.txt
new file mode 100644
index 000000000..2bbd4a21a
--- /dev/null
+++ b/inc/lang/ar/resetpwd.txt
@@ -0,0 +1,3 @@
+====== اضبط كلمة سر جديدة ======
+
+أدخل كلمة سر جديدة لحسابك في هذه الويكي.
diff --git a/lib/plugins/config/lang/ar/lang.php b/lib/plugins/config/lang/ar/lang.php
index 3855f4ac1..2e55446ec 100644
--- a/lib/plugins/config/lang/ar/lang.php
+++ b/lib/plugins/config/lang/ar/lang.php
@@ -41,9 +41,13 @@ $lang['lang']                  = 'لغة الواجهة';
 $lang['basedir']               = 'مسار الخادوم (مثال. <code>/dokuwiki/</code>) اترك فارغا للاكتشاف التلقائي.';
 $lang['baseurl']               = 'عنوان الخادوم (مثال. <code>http://www.yourserver.com</code>). اترك فارغا للاكتشاف التلقائي.';
 $lang['savedir']               = 'دليل حفظ البيانات';
+$lang['cookiedir']             = 'مسار الكعكات. اترك فارغا لاستخدام baseurl.';
 $lang['start']                 = 'اسم صفحة البداية';
 $lang['title']                 = 'عنوان الويكي';
 $lang['template']              = 'القالب';
+$lang['tagline']               = 'Tagline (في حال دعم القالب له)
+';
+$lang['sidebar']               = 'اسم صفحة الشريط الجانبي (في حال دعم القالب له). تركه فارغا يعطل الشريط الجانبي.';
 $lang['license']               = 'تحت أي رخصة تريد اصدار المحتوى؟';
 $lang['fullpath']              = 'اظهر المحتوى الكامل للصفحات في ';
 $lang['recent']                = 'أحدث التغييرات';
@@ -64,6 +68,7 @@ $lang['useheading']            = 'استخدم اول ترويسة كأسم لل
 $lang['refcheck']              = 'التحقق من مرجع الوسائط';
 $lang['refshow']               = 'عدد مراجع الوسائط لتعرض';
 $lang['allowdebug']            = 'مكّن التنقيح <b>عطّلها إن لم تكن بحاجلة لها!</b>';
+$lang['mediarevisions']        = 'تفعيل إصدارات الوسائط؟';
 $lang['usewordblock']          = 'احجز الغثاء بناء على قائمة كلمات';
 $lang['indexdelay']            = 'التأخير قبل الفهرسة (ثوان)';
 $lang['relnofollow']           = 'استخدم rel="nofollow" للروابط الخارجية';
@@ -86,6 +91,8 @@ $lang['disableactions_other']  = 'اجراءات أخرى (مفصولة بالف
 $lang['sneaky_index']          = 'افتراضيا، ستعرض دوكو ويكي كل اسماء النطاقات في عرض الفهرس. تفعيل هذا الخيار سيخفي مالا يملك المستخدم صلاحية قراءته. قد يؤدي هذا إلى اخفاء نطاقات فرعية متاحة. وقد يؤدي لجعل صفحة الفهرس معطلة في بعض اعدادات ACL.';
 $lang['auth_security_timeout'] = 'زمن انتهاء أمان المواثقة (ثوان)';
 $lang['securecookie']          = 'هل يفرض على كعكات التصفح المعدة عبر HTTPS ان ترسل فقط عبر HTTPS من قبل المتصفح؟ عطل هذا إن كان الولوج للويكي مؤمنا فقط عبر SSL لكن تصفح الويكي غير مؤمن.';
+$lang['remote']                = 'مكّن نظام API البعيد. يسمح هذا لبرامج أخرى بالوصول للويكي عبر XML-RPC أو آليات أخرى.';
+$lang['remoteuser']            = 'احصر الوصول البعيد ل API لمستخدمين ومجموعات يفصل بينها بالفاصلة هنا. اترك فارغا لتمكين الجميع.';
 $lang['updatecheck']           = 'تحقق من التحديثات و تنبيهات الأمان؟ دوكو ويكي ستحتاج للاتصال ب update.dokuwiki.org لأجل ذلك';
 $lang['userewrite']            = 'استعمل عناوين URLs جميلة';
 $lang['useslash']              = 'استخدم الشرطة كفاصل النطاق في العناوين';
@@ -109,10 +116,13 @@ $lang['jpg_quality']           = 'دقة ضغط JPG (0-100)';
 $lang['subscribers']           = 'مكن دعم اشتراك الصفحة';
 $lang['subscribe_time']        = 'المهلة بعد ارسال قوائم الاشتراكات والملخصات (ثوان); هذا يجب أن يكون أقل من الوقت المخصص في أيام أحدث التغييرات.';
 $lang['compress']              = 'رُص مخرجات CSS و جافا سكربت';
+$lang['cssdatauri']            = 'الحجم بالبايتات للصور المذكورة في CSS التي ستُضمن في صفحة-التنسيق لخفض طلبات HTTP. لن تعمل هذه التقنية في IE 7 أو أقل! <code>400</code> إلى <code>600</code> بايت تعد قيمة جيدة. اضبط إلى <code>0</code> لتعطلها.';
 $lang['hidepages']             = 'أخف الصفحات المنطبق عليها (تعابير شرطية)';
 $lang['send404']               = 'ارسل "HTTP 404/Page Not Found" للصفحات غير الموجودة';
 $lang['sitemap']               = 'ولد خرائط موقع جوجل (أيام)';
+$lang['broken_iua']            = 'هل الوظيفة ignore_user_abort معطلة على جهازك؟ قد يؤدي ذلك لتعطيل فهرسة البحث. IIS+PHP/CGI تعرف بأنها لاتعمل. أنظر <a href="http://bugs.splitbrain.org/?do=details&task_id=852">العلة 852</a> لمزيد من المعلومات.';
 $lang['xsendfile']             = 'استخدم ترويسة X-Sendfile لتمكين خادم الوب من تقديم ملفات ثابتة؟ يجب أن يكون خادم الوب داعما له.';
+$lang['renderer_xhtml']        = 'المحرك ليستخدم لمخرجات الويكي الأساسية وفق (xhtml).';
 $lang['renderer__core']        = '%s (نواة دوكو ويكي)';
 $lang['renderer__plugin']      = '%s (ملحق)';
 $lang['rememberme']            = 'اسمح بكعكات الدخول الدائم (تذكرني)';
@@ -122,6 +132,7 @@ $lang['rss_content']           = 'مالذي يعرض في عناصر تلقيم
 $lang['rss_update']            = 'تحديث تلقيم XML (ثوان)';
 $lang['recent_days']           = 'مدة إبقاء أحدث التغييرات (ايام)';
 $lang['rss_show_summary']      = 'تلقيم XML يظهر ملخصا في العنوان';
+$lang['rss_media']             = 'مانوع التغييرات التي ستدرج في تغذية XML؟';
 $lang['target____wiki']        = 'النافذة الهدف للروابط الداخلية';
 $lang['target____interwiki']   = 'النافذة الهدف للروابط الممرة interwiki';
 $lang['target____extern']      = 'النافذة الهدف للروابط الخارجية';
diff --git a/lib/plugins/plugin/lang/ar/lang.php b/lib/plugins/plugin/lang/ar/lang.php
index fbc6d3c36..8327e5ce3 100644
--- a/lib/plugins/plugin/lang/ar/lang.php
+++ b/lib/plugins/plugin/lang/ar/lang.php
@@ -50,3 +50,4 @@ $lang['enabled']               = 'الاضافة %s فُعلت.	';
 $lang['notenabled']            = 'تعذر تفعيل الاضافة %s، تحقق من اذونات الملف.';
 $lang['disabled']              = 'عُطلت الإضافة %s.';
 $lang['notdisabled']           = 'تعذر تعطيل الإضافة %s، تحقق من اذونات الملف.';
+$lang['packageinstalled']      = 'حزمة الإضافة (%d plugin(s): %Xs) ثبتت بنجاج.';
-- 
cgit v1.2.3


From 389762f8976d87198af8a6aa178bc7026dde98f0 Mon Sep 17 00:00:00 2001
From: Padmanabh Kulkarni <kulkarnipadmanabh@gmail.com>
Date: Sun, 15 Apr 2012 12:46:42 +0200
Subject: Marathi language update

---
 inc/lang/mr/lang.php | 82 ++++++++++++++++++++++++++++++++++++++++++++--------
 1 file changed, 70 insertions(+), 12 deletions(-)

diff --git a/inc/lang/mr/lang.php b/inc/lang/mr/lang.php
index 96323394d..32781e6d4 100644
--- a/inc/lang/mr/lang.php
+++ b/inc/lang/mr/lang.php
@@ -44,13 +44,16 @@ $lang['btn_back']              = 'मागॆ';
 $lang['btn_backlink']          = 'येथे काय जोडले आहे';
 $lang['btn_backtomedia']       = 'परत माध्यम फाइल निवडीकड़े';
 $lang['btn_subscribe']         = 'पृष्ठाच्या बदलांची पुरवणी (फीड) लावा ';
-$lang['btn_unsubscribe']       = 'पृष्ठाच्या बदलांची पुरवणी (फीड) बंद करा';
 $lang['btn_profile']           = 'प्रोफाइल अद्ययावत करा';
 $lang['btn_reset']             = 'रिसेट';
+$lang['btn_resendpwd']         = 'नवीन पासवर्ड';
 $lang['btn_draft']             = 'प्रत संपादन';
 $lang['btn_recover']           = 'प्रत परत मिळवा';
 $lang['btn_draftdel']          = 'प्रत रद्द';
+$lang['btn_revert']            = 'पुनर्स्थापन';
 $lang['btn_register']          = 'नोंदणी';
+$lang['btn_apply']             = 'लागू';
+$lang['btn_media']             = 'मिडिया व्यवस्थापक';
 $lang['loggedinas']            = 'लॉगिन नाव';
 $lang['user']                  = 'वापरकर्ता';
 $lang['pass']                  = 'परवलीचा शब्द';
@@ -81,19 +84,58 @@ $lang['profchanged']           = 'सदस्याची प्रोफाइ
 $lang['pwdforget']             = 'परवलीचा शब्द विसरला आहे का? नविन मागवा.';
 $lang['resendna']              = 'ह्या विकी मधे परवलीचा शब्द परत पाथाव्न्याची सुविधा नाही.';
 $lang['resendpwd']             = 'नविन परवली इच्छुक';
+$lang['resendpwdmissing']      = 'माफ करा, पण सर्व जागा भरल्या पाहिजेत.';
 $lang['resendpwdnouser']       = 'माफ़ करा, हा सदस्य आमच्या माहितिसंग्रहात सापडला नाही.';
 $lang['resendpwdbadauth']      = 'माफ़ करा, हा अधिकार कोड बरोबर नाही. कृपया आपण पूर्ण शिकामोर्तबाची लिंक वापरल्याची खात्री करा.';
 $lang['resendpwdconfirm']      = 'शिक्कामोर्तबाची लिंक ईमेल द्वारा पाठवली आहे.';
 $lang['resendpwdsuccess']      = 'शिक्कामोर्तबाची लिंक ईमेल द्वारा पाठवली आहे.';
 $lang['license']               = 'विशिष्ठ नोंद केलि नसल्यास ह्या विकी वरील सर्व मजकूर खालील लायसन्स मधे मोडतो : ';
 $lang['licenseok']             = 'नोंद : हे पृष्ठ संपादित केल्यास तुम्ही तुमचे योगदान खालील लायसन्स अंतर्गत येइल : ';
+$lang['searchmedia']           = 'फाईल शोधा:';
+$lang['searchmedia_in']        = '%s मधे शोधा';
 $lang['txt_upload']            = 'अपलोड करण्याची फाइल निवडा';
 $lang['txt_filename']          = 'अपलोड उर्फ़ ( वैकल्पिक )';
 $lang['txt_overwrt']           = 'अस्तित्वात असलेल्या फाइलवरच सुरक्षित करा.';
 $lang['lockedby']              = 'सध्या लॉक करणारा :';
 $lang['lockexpire']            = 'सध्या लॉक करणारा :';
-$lang['js']['willexpire']            = 'हे पृष्ठ संपादित करण्यासाठी मिळालेले लॉक एखाद्या मिनिटात संपणार आहे.\n चुका होऊ नयेत म्हणुन कृपया प्रीव्यू बटन दाबुन लॉक ची वेळ पुन्हा चालू करा.';
-$lang['js']['notsavedyet']     = "सुरक्षित न केलेले बदल नष्ट होतील. नक्की करू का ?";
+$lang['js']['willexpire']      = 'हे पृष्ठ संपादित करण्यासाठी मिळालेले लॉक एखाद्या मिनिटात संपणार आहे.\n चुका होऊ नयेत म्हणुन कृपया प्रीव्यू बटन दाबुन लॉक ची वेळ पुन्हा चालू करा.';
+$lang['js']['notsavedyet']     = 'सुरक्षित न केलेले बदल नष्ट होतील. नक्की करू का ?';
+$lang['js']['searchmedia']     = 'फाईल्ससाठी शोधा';
+$lang['js']['keepopen']        = 'निवड केल्यावर विण्डो उघडी ठेवा';
+$lang['js']['hidedetails']     = 'सविस्तर मजकूर लपवा';
+$lang['js']['mediatitle']      = 'लिंक सेटिंग';
+$lang['js']['mediadisplay']    = 'लिंकचा प्रकार';
+$lang['js']['mediaalign']      = 'जुळवणी';
+$lang['js']['mediasize']       = 'प्रतिमेचा आकार';
+$lang['js']['mediatarget']     = 'लिंकचे लक्ष्य';
+$lang['js']['mediaclose']      = 'बंद';
+$lang['js']['mediadisplayimg'] = 'प्रतिमा दाखवा.';
+$lang['js']['mediadisplaylnk'] = 'फक्त लिंक दाखवा.';
+$lang['js']['mediasmall']      = 'लहान आवृत्ती';
+$lang['js']['mediamedium']     = 'माध्यम आवृत्ती';
+$lang['js']['medialarge']      = 'मोठी आवृत्ती';
+$lang['js']['mediaoriginal']   = 'मूळ आवृत्ती';
+$lang['js']['medialnk']        = 'सविस्तर माहितीकडेची लिंक';
+$lang['js']['mediadirect']     = 'मूळ मजकुराकडे थेट लिंक';
+$lang['js']['medianolnk']      = 'लिंक नको';
+$lang['js']['medianolink']     = 'प्रतिमा लिंक करू नका';
+$lang['js']['medialeft']       = 'प्रतिमा डाव्या बाजूला जुळवून घ्या.';
+$lang['js']['mediaright']      = 'प्रतिमा उजव्या बाजूला जुळवून घ्या.';
+$lang['js']['mediacenter']     = 'प्रतिमा मध्यभागी जुळवून घ्या.';
+$lang['js']['medianoalign']    = 'जुळवाजुळव वापरू नका.';
+$lang['js']['nosmblinks']      = 'विन्डोज़ शेअर ला लिंक केल्यास ते फक्त मायक्रोसॉफ़्ट इन्टरनेट एक्स्प्लोरर वरच चालते. तरी तुम्ही लिंक कॉपी करू शकता.';
+$lang['js']['linkwiz']         = 'लिंक जादूगार';
+$lang['js']['linkto']          = 'याला लिंक करा:';
+$lang['js']['del_confirm']     = 'निवडलेल्या गोष्टी नक्की नष्ट करू का ?';
+$lang['js']['restore_confirm'] = 'हि आवृत्ती खरोखर पुनर्स्थापित करू का?';
+$lang['js']['media_diff']      = 'फरक बघू:';
+$lang['js']['media_diff_both'] = 'बाजूबाजूला';
+$lang['js']['media_diff_portions'] = 'स्वाईप';
+$lang['js']['media_select']    = 'फाईल निवड...';
+$lang['js']['media_upload_btn'] = 'अपलोड';
+$lang['js']['media_done_btn']  = 'झालं';
+$lang['js']['media_drop']      = 'अपलोड करण्यासाठी इथे फाईल टाका';
+$lang['js']['media_cancel']    = 'काढा';
 $lang['rssfailed']             = 'ही पुरवणी आणण्यात काही चूक झाली:';
 $lang['nothingfound']          = 'काही सापडला नाही.';
 $lang['mediaselect']           = 'दृकश्राव्य फाइल';
@@ -111,9 +153,7 @@ $lang['deletefail']            = '%s ही फाइल नष्ट करू
 $lang['mediainuse']            = '%s ही फाइल नष्ट केली नाही - ती अजुन वापरात आहे.';
 $lang['namespaces']            = 'नेमस्पेस';
 $lang['mediafiles']            = 'मध्ये उपलब्ध असलेल्या फाइल';
-$lang['js']['keepopen']        = 'निवड केल्यावर विण्डो उघडी ठेवा';
-$lang['js']['hidedetails']     = 'सविस्तर मजकूर लपवा';
-$lang['js']['nosmblinks']      = 'विन्डोज़ शेअर ला लिंक केल्यास ते फक्त मायक्रोसॉफ़्ट इन्टरनेट एक्स्प्लोरर वरच चालते. तरी तुम्ही लिंक कॉपी करू शकता.';
+$lang['accessdenied']          = 'तुम्हाला हे पान बघायची परवानगी नाही.';
 $lang['mediausage']            = 'ह्या फाइलचा संदर्भ देण्यासाठी खालील सिन्टॅक्स वापरा :';
 $lang['mediaview']             = 'मूळ फाइल बघू ';
 $lang['mediaroot']             = 'रूट';
@@ -129,6 +169,10 @@ $lang['current']               = 'चालू';
 $lang['yours']                 = 'तुमची आवृत्ति';
 $lang['diff']                  = 'सध्याच्या आवृत्तिंशी फरक दाखवा';
 $lang['diff2']                 = 'निवडलेल्या आवृत्तिंमधील फरक दाखवा';
+$lang['difflink']              = 'ह्या तुलना दृष्टीकोनाला लिंक करा';
+$lang['diff_type']             = 'फरक बघू:';
+$lang['diff_inline']           = 'एका ओळीत';
+$lang['diff_side']             = 'बाजूबाजूला';
 $lang['line']                  = 'ओळ';
 $lang['breadcrumb']            = 'मागमूस';
 $lang['youarehere']            = 'तुम्ही इथे आहात';
@@ -140,10 +184,21 @@ $lang['restored']              = 'जुनी आवृत्ति पुन
 $lang['external_edit']         = 'बाहेरून संपादित';
 $lang['summary']               = 'सारांश बदला';
 $lang['noflash']               = 'ही माहिती दाखवण्यासाठी <a href="http://www.adobe.com/products/flashplayer/">अडोब फ्लॅश प्लेअर</a> ची गरज आहे.';
+$lang['download']              = 'तुकडा डाउनलोड करा';
+$lang['tools']                 = 'साधने';
+$lang['user_tools']            = 'युजरची साधने';
+$lang['site_tools']            = 'साईटची साधने';
+$lang['page_tools']            = 'पानाची साधने';
+$lang['skip_to_content']       = 'सरळ मजकुराकडे ';
 $lang['mail_newpage']          = 'पृष्ठ जोडले : ';
 $lang['mail_changed']          = 'पृष्ठ बदलले : ';
+$lang['mail_subscribe_list']   = 'ह्या नेमस्पेस नाढे बदललेली पाने:';
 $lang['mail_new_user']         = 'नवीन सदस्य : ';
 $lang['mail_upload']           = 'फाइल अपलोड केली : ';
+$lang['changes_type']          = 'ह्याचे बदल बघू';
+$lang['pages_changes']         = 'पाने';
+$lang['media_changes']         = 'मिडिया फाईल';
+$lang['both_changes']          = 'पाने आणि मिडिया फाईल दोन्ही';
 $lang['qb_bold']               = 'ठळक मजकूर';
 $lang['qb_italic']             = 'तिरका मजकूर';
 $lang['qb_underl']             = 'अधोरेखित मजकूर';
@@ -154,6 +209,11 @@ $lang['qb_h2']                 = 'दुसर्या पातळीचे 
 $lang['qb_h3']                 = 'तिसर्या पातळीचे शीर्षक';
 $lang['qb_h4']                 = 'चवथ्या पातळीचे शीर्षक';
 $lang['qb_h5']                 = 'पाचव्या पातळीचे शीर्षक';
+$lang['qb_h']                  = 'शीर्षक';
+$lang['qb_hs']                 = 'शीर्षक निवड';
+$lang['qb_hplus']              = 'उंच शीर्षक';
+$lang['qb_hminus']             = 'खालचं शीर्षक';
+$lang['qb_hequal']             = 'समान लेवलचे शीर्षक';
 $lang['qb_link']               = 'अंतर्गत लिंक';
 $lang['qb_extlink']            = 'बाह्य लिंक';
 $lang['qb_hr']                 = 'आडवी पट्टी';
@@ -163,7 +223,7 @@ $lang['qb_media']              = 'प्रतिमा आणि इतर फ
 $lang['qb_sig']                = 'स्वाक्षरी टाका';
 $lang['qb_smileys']            = 'स्माइली';
 $lang['qb_chars']              = 'ख़ास चिन्ह';
-$lang['js']['del_confirm']           = 'निवडलेल्या गोष्टी नक्की नष्ट करू का ?';
+$lang['upperns']               = 'ह्यावरच्या नेमस्पेसकडे उडी मारा';
 $lang['admin_register']        = 'नवीन सदस्य';
 $lang['metaedit']              = 'मेटाडेटा बदला';
 $lang['metasaveerr']           = 'मेटाडेटा सुरक्षित झाला नाही';
@@ -179,11 +239,9 @@ $lang['img_copyr']             = 'कॉपीराइट';
 $lang['img_format']            = 'प्रकार';
 $lang['img_camera']            = 'कॅमेरा';
 $lang['img_keywords']          = 'मुख्य शब्द';
-$lang['subscribe_success']     = '%s  ला %s च्या पुरवणिसाठि नोंदवले';
-$lang['subscribe_error']       = '%s  ला %s च्या पुरवणिसाठि नोंदवताना चूक झाली';
-$lang['subscribe_noaddress']   = 'तुमच्या लॉगिनशी  सम्बंधित कुठलाही पत्ता नाही , त्यामुळे पुरवणिसाठि नोंद केली जाऊ शकत नाही';
-$lang['unsubscribe_success']   = '%s ला %s च्या पुरवणी यादी मधून काढून टाकले';
-$lang['unsubscribe_error']     = '%s  ला  %s  च्या पुरवणी यादी मधून काढून टाकण्यात चूक झाली';
+$lang['img_width']             = 'रुंदी';
+$lang['img_height']            = 'उंची';
+$lang['img_manager']           = 'मिडिया व्यवस्थापकात बघू';
 $lang['authmodfailed']         = 'सदस्य अधिकृत करण्याची व्यवस्था चुकीची आहे. कृपया तुमच्या विकीच्या व्यवस्थापकाशी सम्पर्क साधा.';
 $lang['authtempfail']          = 'सदस्य अधिकृत करण्याची सुविधा सध्या चालू नाही. सतत हा मजकूर दिसल्यास कृपया तुमच्या विकीच्या व्यवस्थापकाशी सम्पर्क साधा.';
 $lang['i_chooselang']          = 'तुमची भाषा निवडा';
-- 
cgit v1.2.3


From 026b314868ee80aca644bf4107f78d8e8052b43e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emanuel-Emeric=20Andra=C5=9Fi?=
 <em.andrasi@mandrivausers.ro>
Date: Sun, 15 Apr 2012 12:47:43 +0200
Subject: Romanian language update

---
 inc/lang/ro/lang.php                     | 9 +++++++++
 inc/lang/ro/resetpwd.txt                 | 3 +++
 lib/plugins/acl/lang/ro/lang.php         | 1 +
 lib/plugins/config/lang/ro/lang.php      | 6 ++++++
 lib/plugins/plugin/lang/ro/lang.php      | 1 +
 lib/plugins/popularity/lang/ro/lang.php  | 1 +
 lib/plugins/revert/lang/ro/lang.php      | 1 +
 lib/plugins/usermanager/lang/ro/lang.php | 1 +
 8 files changed, 23 insertions(+)
 create mode 100644 inc/lang/ro/resetpwd.txt

diff --git a/inc/lang/ro/lang.php b/inc/lang/ro/lang.php
index 21a6ecef4..41727e521 100644
--- a/inc/lang/ro/lang.php
+++ b/inc/lang/ro/lang.php
@@ -9,6 +9,7 @@
  * @author Emanuel-Emeric Andraşi <em.andrasi@mandrivausers.ro>
  * @author Marius OLAR <olarmariusalex@gmail.com>
  * @author Marius Olar <olarmariusalex@yahoo.com>
+ * @author Emanuel-Emeric Andrași <em.andrasi@mandrivausers.ro>
  */
 $lang['encoding']              = 'utf-8';
 $lang['direction']             = 'ltr';
@@ -44,6 +45,7 @@ $lang['btn_backtomedia']       = 'Înapoi la Selecţia Mediafile';
 $lang['btn_subscribe']         = 'Subscrie Modificarea Paginii';
 $lang['btn_profile']           = 'Actualizează Profil';
 $lang['btn_reset']             = 'Resetează';
+$lang['btn_resendpwd']         = 'Setează o parolă nouă';
 $lang['btn_draft']             = 'Editează schiţă';
 $lang['btn_recover']           = 'Recuperează schiţă';
 $lang['btn_draftdel']          = 'Şterge schiţă';
@@ -80,6 +82,7 @@ $lang['profnoempty']           = 'Nu sunt admise numele sau adresa de email neco
 $lang['profchanged']           = 'Profilul de utilizator a fost actualizat succes.';
 $lang['pwdforget']             = 'Parola uitată? Luaţi una nouă';
 $lang['resendna']              = 'Această wiki nu suportă retrimiterea parolei.';
+$lang['resendpwd']             = 'Setează o parolă nouă pentru';
 $lang['resendpwdmissing']      = 'Ne pare rău, trebuie completate toate câmpurile.';
 $lang['resendpwdnouser']       = 'Ne pare rău, acest utilizator nu poate fi găsit în baza de date.';
 $lang['resendpwdbadauth']      = 'Ne pare rău, acest cod de autorizare nu este corect. Verificaţi dacă aţi folosit tot link-ul de confirmare.';
@@ -186,6 +189,11 @@ $lang['external_edit']         = 'editare externă';
 $lang['summary']               = 'Editează sumarul';
 $lang['noflash']               = 'Plugin-ul <a href="http://www.adobe.com/products/flashplayer/">Adobe Flash Plugin</a> este necesar pentru afişarea corectă a conţinutului.';
 $lang['download']              = 'Bloc descărcări';
+$lang['tools']                 = 'Unelte';
+$lang['user_tools']            = 'Unelte utilizator';
+$lang['site_tools']            = 'Unelte Site';
+$lang['page_tools']            = 'Unelte Pagină';
+$lang['skip_to_content']       = 'sari la conținut';
 $lang['mail_newpage']          = 'pagina adăugată:';
 $lang['mail_changed']          = 'page schimbată:';
 $lang['mail_subscribe_list']   = 'pagini modificate în spaţiul de nume:';
@@ -256,6 +264,7 @@ $lang['subscr_style_digest']   = 'digerează email la schimbări pentru fiecare
 $lang['subscr_style_list']     = 'lista paginilor schimbate de la ultimul email (la fiecare %.2f zile)';
 $lang['authmodfailed']         = 'Configuraţia autentificării utilizatorului este eronată. Anunţaţi Wiki Admin-ul.';
 $lang['authtempfail']          = 'Autentificarea utilizatorului este temporar indisponibilă. Anunţaţi Wiki Admin-ul.';
+$lang['authpwdexpire']         = 'Parola vă va expira în %d zile, ar trebui să o schimbați curând.';
 $lang['i_chooselang']          = 'Alegeţi limba';
 $lang['i_installer']           = 'DokuWiki Installer';
 $lang['i_wikiname']            = 'Numele Wiki';
diff --git a/inc/lang/ro/resetpwd.txt b/inc/lang/ro/resetpwd.txt
new file mode 100644
index 000000000..2eb8052f1
--- /dev/null
+++ b/inc/lang/ro/resetpwd.txt
@@ -0,0 +1,3 @@
+====== Setează parolă nouă ======
+
+Vă rugăm să introduceți o nouă parolă pentru contul dvs. pe acest wiki.
\ No newline at end of file
diff --git a/lib/plugins/acl/lang/ro/lang.php b/lib/plugins/acl/lang/ro/lang.php
index c278c918e..4d093216b 100644
--- a/lib/plugins/acl/lang/ro/lang.php
+++ b/lib/plugins/acl/lang/ro/lang.php
@@ -10,6 +10,7 @@
  * @author Emanuel-Emeric Andrasi <em.andrasi@mandrivausers.ro>
  * @author Marius OLAR <olarmariusalex@gmail.com>
  * @author Marius Olar <olarmariusalex@yahoo.com>
+ * @author Emanuel-Emeric Andrași <em.andrasi@mandrivausers.ro>
  */
 $lang['admin_acl']             = 'Managementul Listei de Control a Accesului';
 $lang['acl_group']             = 'Grup';
diff --git a/lib/plugins/config/lang/ro/lang.php b/lib/plugins/config/lang/ro/lang.php
index d638e1eec..72b205b90 100644
--- a/lib/plugins/config/lang/ro/lang.php
+++ b/lib/plugins/config/lang/ro/lang.php
@@ -10,6 +10,7 @@
  * @author Emanuel-Emeric Andrasi <em.andrasi@mandrivausers.ro>
  * @author Marius OLAR <olarmariusalex@gmail.com>
  * @author Marius Olar <olarmariusalex@yahoo.com>
+ * @author Emanuel-Emeric Andrași <em.andrasi@mandrivausers.ro>
  */
 $lang['menu']                  = 'Setări de Configurare';
 $lang['error']                 = 'Setări nu au fost actualizate datorită unei valori incorecte; verificaţi modificările şi încercaţi din nou. <br /> Valorile incorecte vor apărea într-un chenar roşu.';
@@ -48,6 +49,8 @@ $lang['cookiedir']             = 'Cale Cookie. Lăsați gol pentru a utiliza bas
 $lang['start']                 = 'Numele paginii de start';
 $lang['title']                 = 'Titlul wiki';
 $lang['template']              = 'Şablon';
+$lang['tagline']               = 'Slogan (dacă templateul suportă opțiunea)';
+$lang['sidebar']               = 'Numele paginii barei laterale (dacă templateul suportă opțiunea), câmpul lăsat gol dezactivează bara laterală';
 $lang['license']               = 'Sub ce licenţă va fi publicat conţinutul?';
 $lang['fullpath']              = 'Arată calea completă a paginii în subsol';
 $lang['recent']                = 'Modificări recente';
@@ -91,6 +94,8 @@ $lang['disableactions_other']  = 'Alte acţiuni (separate prin virgulă)';
 $lang['sneaky_index']          = 'Implicit, DokuWiki va arăta toate numele de spaţii la vizualizarea indexului. Activând această opţiune vor fi ascunse acelea la care utilizatorul nu are drepturi de citire. Aceasta poate determina ascunderea sub-numelor de spaţii accesibile. Aceasta poate face index-ul  inutilizabil cu anumite setări ale ACL';
 $lang['auth_security_timeout'] = 'Timpul de expirare al Autentificării Securizate (secunde)';
 $lang['securecookie']          = 'Cookies-urile setate via HTTPS să fie trimise doar via HTTPS de către browser? Dezactivaţi această opţiune numai când login-ul wiki-ului este securizat cu SSL dar navigarea wiki-ului se realizează nesecurizat.';
+$lang['remote']                = 'Activează sistemul remote API. Acesta permite altor aplicații să acceseze wiki-ul via XML-RPC sau alte mecanisme.';
+$lang['remoteuser']            = 'Restricționează accesul sistemului remote API la grupurile sau utilizatorii următori (separați prin virgulă). Lăsați câmpul gol pentru a da acces către toți.';
 $lang['updatecheck']           = 'Verificare actualizări şi avertismente privind securitatea? DokuWiki trebuie să contacteze update.dokuwiki.org pentru această facilitate.';
 $lang['userewrite']            = 'Folosire URL-uri "nice"';
 $lang['useslash']              = 'Foloseşte slash-ul ca separator de spaţii de nume în URL-uri';
@@ -130,6 +135,7 @@ $lang['rss_content']           = 'Ce să afişez în obiectele fluxurilor XML';
 $lang['rss_update']            = 'Intervalul de actualizare a fluxului XML (sec)';
 $lang['recent_days']           = 'Câte modificări recente să se păstreze?';
 $lang['rss_show_summary']      = 'Fluxul XML arată rezumat în titlu';
+$lang['rss_media']             = 'Ce fel de modificări ar trebui afișate în fluxul XML?';
 $lang['target____wiki']        = 'Fereastra ţintă pentru legăturile interne';
 $lang['target____interwiki']   = 'Fereastra ţintă pentru legăturile interwiki';
 $lang['target____extern']      = 'Fereastra ţintă pentru legăturile externe';
diff --git a/lib/plugins/plugin/lang/ro/lang.php b/lib/plugins/plugin/lang/ro/lang.php
index 50f6ca6f6..c57647e0b 100644
--- a/lib/plugins/plugin/lang/ro/lang.php
+++ b/lib/plugins/plugin/lang/ro/lang.php
@@ -10,6 +10,7 @@
  * @author Emanuel-Emeric Andrasi <em.andrasi@mandrivausers.ro>
  * @author Marius OLAR <olarmariusalex@gmail.com>
  * @author Marius Olar <olarmariusalex@yahoo.com>
+ * @author Emanuel-Emeric Andrași <em.andrasi@mandrivausers.ro>
  */
 $lang['menu']                  = 'Administrează plugin-uri';
 $lang['download']              = 'Descarcă şi instalează un nou plugin';
diff --git a/lib/plugins/popularity/lang/ro/lang.php b/lib/plugins/popularity/lang/ro/lang.php
index 9e9086b0d..8ba119dcb 100644
--- a/lib/plugins/popularity/lang/ro/lang.php
+++ b/lib/plugins/popularity/lang/ro/lang.php
@@ -8,6 +8,7 @@
  * @author Emanuel-Emeric Andrasi <em.andrasi@mandrivausers.ro>
  * @author Marius OLAR <olarmariusalex@gmail.com>
  * @author Marius Olar <olarmariusalex@yahoo.com>
+ * @author Emanuel-Emeric Andrași <em.andrasi@mandrivausers.ro>
  */
 $lang['name']                  = 'Feedback de popularitate (încărcarea poate dura mai mult)';
 $lang['submit']                = 'Trimite datele';
diff --git a/lib/plugins/revert/lang/ro/lang.php b/lib/plugins/revert/lang/ro/lang.php
index f1fcf727c..5ea802575 100644
--- a/lib/plugins/revert/lang/ro/lang.php
+++ b/lib/plugins/revert/lang/ro/lang.php
@@ -10,6 +10,7 @@
  * @author Emanuel-Emeric Andrasi <em.andrasi@mandrivausers.ro>
  * @author Marius OLAR <olarmariusalex@gmail.com>
  * @author Marius Olar <olarmariusalex@yahoo.com>
+ * @author Emanuel-Emeric Andrași <em.andrasi@mandrivausers.ro>
  */
 $lang['menu']                  = 'Manager Reveniri';
 $lang['filter']                = 'Caută pagini cu posibil spam';
diff --git a/lib/plugins/usermanager/lang/ro/lang.php b/lib/plugins/usermanager/lang/ro/lang.php
index 7aac6cfb0..1b33cc4f8 100644
--- a/lib/plugins/usermanager/lang/ro/lang.php
+++ b/lib/plugins/usermanager/lang/ro/lang.php
@@ -10,6 +10,7 @@
  * @author Emanuel-Emeric Andrasi <em.andrasi@mandrivausers.ro>
  * @author Marius OLAR <olarmariusalex@gmail.com>
  * @author Marius Olar <olarmariusalex@yahoo.com>
+ * @author Emanuel-Emeric Andrași <em.andrasi@mandrivausers.ro>
  */
 $lang['menu']                  = 'Manager Utilizatori';
 $lang['noauth']                = '(autentificarea utilizatorilor nu este disponibilă)';
-- 
cgit v1.2.3