Merge branch 'master' into stable

* master: (54 commits)
  release preparations
  RTL and IE7 fixes for code blocks
  beautified code blocks, also using lighter background colour (FS#2444)
  improved section highlighting styles
  removed unnecessary print styles
  fixed interwiki and filetype styles being included in all css modes
  moved some styles around
  improved tab styles
  fixed typo in style.ini
  Brazilia Portuguese language update
  #2541, alter section highlighting to insert a container into the DOM to hold the elements being highlighted & later remove it
  fixed lib/tpl/index.php to reflect recent changes
  changed local style.ini to be merged with standard one
  removed template dependencies from underscored CSS files in new default template
  fixed 2-digit ordered list items in sidebar (FS#2624)
  improved grammar in preview text (FS#2614)
  improvements to h1 in sidebar (follow font size scale + vertical grid)
  adjusted h1 size in sidebar
  fixed warning in popularity plugin FS#2628
  added support for local style.ini files
  ...

12 files changed, 362 insertions, 352 deletions

diff --git a/lib/tpl/dokuwiki/css/_edit.css b/lib/tpl/dokuwiki/css/_edit.css
index e4182774e..0c66c75b7 100644
--- a/lib/tpl/dokuwiki/css/_edit.css
+++ b/lib/tpl/dokuwiki/css/_edit.css
@@ -135,13 +135,10 @@ div.picker button.toolbutton {
     font-size: 75%;
 }
 
-/* generic style for section highlighting (including headings) */
-.dokuwiki .section_highlight {
-}
-/* style for section highlighting (only sections below headings) */
+/* style for section highlighting */
 .dokuwiki div.section_highlight {
-    margin: -3em -1em -.01em -1em; /* negative side margin = side padding + side border */
-    padding: 3em .5em .01em .5em;
+    margin: 0 -1em; /* negative side margin = side padding + side border */
+    padding: 0 .5em;
     border: solid __background_alt__;
     border-width: 0 .5em;
 }
diff --git a/lib/tpl/dokuwiki/css/_links.css b/lib/tpl/dokuwiki/css/_links.css
index e53ba45e5..7e5fb02cd 100644
--- a/lib/tpl/dokuwiki/css/_links.css
+++ b/lib/tpl/dokuwiki/css/_links.css
@@ -6,13 +6,9 @@
 
 /* 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,
@@ -43,15 +39,15 @@
 }
 /* external link */
 .dokuwiki a.urlextern {
-    background-image: url(images/external-link.png);
+    background-image: url(../../images/external-link.png);
 }
 /* windows share */
 .dokuwiki a.windows {
-    background-image: url(images/unc.png);
+    background-image: url(../../images/unc.png);
 }
 /* email link */
 .dokuwiki a.mail {
-    background-image: url(images/email.png);
+    background-image: url(../../images/email.png);
 }
 
 /* icons of the following are set by dokuwiki in lib/exe/css.php */
diff --git a/lib/tpl/dokuwiki/css/_media_fullscreen.css b/lib/tpl/dokuwiki/css/_media_fullscreen.css
index f795c6d65..8d5e1e8ca 100644
--- a/lib/tpl/dokuwiki/css/_media_fullscreen.css
+++ b/lib/tpl/dokuwiki/css/_media_fullscreen.css
@@ -65,7 +65,7 @@
 #mediamanager__page .ui-resizable-e {
     width: 6px;
     right: 2px;
-    background: transparent url(images/resizecol.png) center center no-repeat;
+    background: transparent url(../../images/resizecol.png) center center no-repeat;
 }
 #mediamanager__page .ui-resizable-e:hover {
     background-color: __background_alt__;
@@ -91,24 +91,35 @@
     text-align: right;
 }
 
+/* make it look like a tab (as in _tabs.css) */
 #mediamanager__page .namespaces h2 {
     font-size: 1em;
     display: inline-block;
-    border-width: 0;
     padding: .3em .8em;
-    margin: 0 .3em 0 0;
+    margin: 0 0 0 .3em;
     border-radius: .5em .5em 0 0;
     font-weight: normal;
     background-color: __background_alt__;
     color: __text__;
+    border: 1px solid __border__;
+    border-bottom-color: __background_alt__;
     line-height: 1.4em;
+    position: relative;
+    bottom: -1px;
+    z-index: 2;
 }
 * html #mediamanager__page .namespaces h2,
 *+html #mediamanager__page .namespaces h2 {
     display: inline;
 }
 [dir=rtl] #mediamanager__page .namespaces h2 {
-    margin-right: 10px;
+    margin: 0 .3em 0 0;
+    position: relative;
+    right: 10px;
+}
+#mediamanager__page .namespaces .panelHeader {
+    border-top: 1px solid __border__;
+    z-index: 1;
 }
 
 #mediamanager__page .namespaces ul {
@@ -165,10 +176,12 @@
 
 #mediamanager__page .panelHeader ul li.listType {
     padding-left: 30px;
+    margin: 0 0 0 5px;
     background: url('../../images/icon-list.png') 3px 1px no-repeat;
 }
 #mediamanager__page .panelHeader ul li.sortBy {
     padding-left: 30px;
+    margin: 0 0 0 5px;
     background: url('../../images/icon-sort.png') 3px 1px no-repeat;
 }
 
@@ -185,10 +198,10 @@
 
 #mediamanager__page .filelist ul {
     padding: 0;
-    margin: 0;
+    margin: 0 10px 0 0;
 }
-[dir=rtl] #mediamanager__page .filelist ul.tabs {
-    margin-right: 10px;
+[dir=rtl] #mediamanager__page .filelist ul {
+    margin: 0 10px 0 0;
 }
 
 #mediamanager__page .filelist .panelContent ul li:hover {
diff --git a/lib/tpl/dokuwiki/css/_tabs.css b/lib/tpl/dokuwiki/css/_tabs.css
index 1dffa8f7b..845ec9a57 100644
--- a/lib/tpl/dokuwiki/css/_tabs.css
+++ b/lib/tpl/dokuwiki/css/_tabs.css
@@ -2,40 +2,56 @@
  * This file provides the styles for general tabs.
  */
 
+.dokuwiki .tabs > ul,
 .dokuwiki ul.tabs {
     padding: 0;
     margin: 0;
     overflow: hidden;
+    position: relative;
 }
+/* border underneath */
+.dokuwiki .tabs > ul:after,
+.dokuwiki ul.tabs:after {
+    position: absolute;
+    content: "";
+    width: 100%;
+    bottom: 0;
+    left: 0;
+    border-bottom: 1px solid __border__;
+    z-index: 1;
+}
+
+.dokuwiki .tabs > ul li,
 .dokuwiki ul.tabs li {
     float: left;
     padding: 0;
     margin: 0;
     list-style: none;
 }
+[dir=rtl] .dokuwiki .tabs > ul li,
 [dir=rtl] .dokuwiki ul.tabs li {
     float: right;
 }
 
+.dokuwiki .tabs > ul li a,
 .dokuwiki ul.tabs li strong,
 .dokuwiki ul.tabs li a {
-    float: left;
+    display: inline-block;
     padding: .3em .8em;
-    margin: 0 .3em 0 0;
+    margin: 0 0 0 .3em;
     background-color: __background_neu__;
     color: __text__;
+    border: 1px solid __border__;
     border-radius: .5em .5em 0 0;
+    position: relative;
+    z-index: 0;
 }
+[dir=rtl] .dokuwiki .tabs > ul li a,
 [dir=rtl] .dokuwiki ul.tabs li strong,
 [dir=rtl] .dokuwiki ul.tabs li a {
-    float: right;
-    margin: 0 0 0 .3em;
-}
-*+html[dir=rtl] .dokuwiki ul.tabs li strong,
-*+html[dir=rtl] .dokuwiki ul.tabs li a {
-    float: none;
-    display: inline-block;
+    margin: 0 .3em 0 0;
 }
+
 .dokuwiki ul.tabs li strong {
     font-weight: normal;
 }
@@ -43,6 +59,11 @@
 .dokuwiki ul.tabs li a:link,
 .dokuwiki ul.tabs li a:visited {
 }
+.dokuwiki .tabs > ul li a:hover,
+.dokuwiki .tabs > ul li a:active,
+.dokuwiki .tabs > ul li a:focus,
+.dokuwiki .tabs > ul li .curid a,
+.dokuwiki .tabs > ul .active a,
 .dokuwiki ul.tabs li a:hover,
 .dokuwiki ul.tabs li a:active,
 .dokuwiki ul.tabs li a:focus,
@@ -50,4 +71,12 @@
     background-color: __background_alt__;
     color: __text__;
     text-decoration: none;
+    font-weight: normal;
+}
+
+.dokuwiki .tabs > ul li .curid a,
+.dokuwiki .tabs > ul li .active a,
+.dokuwiki ul.tabs li strong {
+    z-index: 2;
+    border-bottom-color: __background_alt__;
 }
diff --git a/lib/tpl/dokuwiki/css/_toc.css b/lib/tpl/dokuwiki/css/_toc.css
index 0d1b976d1..1226b5b5b 100644
--- a/lib/tpl/dokuwiki/css/_toc.css
+++ b/lib/tpl/dokuwiki/css/_toc.css
@@ -80,14 +80,14 @@
     padding-right: 0;
 }
 .dokuwiki ul.idx li {
-    list-style-image: url(images/bullet.png);
+    list-style-image: url(../../images/bullet.png);
 }
 .dokuwiki ul.idx li.open {
-    list-style-image: url(images/open.png);
+    list-style-image: url(../../images/open.png);
 }
 .dokuwiki ul.idx li.closed {
-    list-style-image: url(images/closed.png);
+    list-style-image: url(../../images/closed.png);
 }
 [dir=rtl] .dokuwiki ul.idx li.closed {
-    list-style-image: url(images/closed-rtl.png);
+    list-style-image: url(../../images/closed-rtl.png);
 }
diff --git a/lib/tpl/dokuwiki/css/basic.css b/lib/tpl/dokuwiki/css/basic.css
index 4942de001..8b7447239 100644
--- a/lib/tpl/dokuwiki/css/basic.css
+++ b/lib/tpl/dokuwiki/css/basic.css
@@ -38,11 +38,20 @@ 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 */
 }
+[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;
+}
 
 h1 {
     font-size: 2em;
@@ -99,11 +108,20 @@ ul,
 ol {
     padding: 0 0 0 1.5em;
 }
+[dir=rtl] ul,
+[dir=rtl] ol {
+    padding: 0 1.5em 0 0;
+}
+
 li,
 dd {
     padding: 0;
     margin: 0 0 0 1.5em;
 }
+[dir=rtl] li,
+[dir=rtl] dd {
+    margin: 0 1.5em 0 0;
+}
 dt {
     font-weight: bold;
     margin: 0;
@@ -145,6 +163,9 @@ caption {
     text-align: left;
     margin: 0 0 .3em;
 }
+[dir=rtl] caption {
+    text-align: right;
+}
 
 th,
 td {
@@ -158,6 +179,10 @@ th {
     font-weight: bold;
     background-color: __background_alt__;
 }
+[dir=rtl] td,
+[dir=rtl] th {
+    text-align: right;
+}
 
 
 /*____________ links ____________*/
@@ -225,10 +250,18 @@ kbd {
     font-size: 1em;
     direction: ltr;
     text-align: left;
+    background-color: __background_site__;
+    color: __text__;
+    box-shadow: inset 0 0 .3em __border__;
+    border-radius: 2px;
 }
 pre {
     overflow: auto;
     word-wrap: normal;
+    border: 1px solid __border__;
+    border-radius: 2px;
+    box-shadow: inset 0 0 .5em __border__;
+    padding: .7em 1em;
 }
 
 blockquote {
@@ -236,6 +269,9 @@ blockquote {
     border: solid __border__;
     border-width: 0 0 0 .25em;
 }
+[dir=rtl] blockquote {
+    border-width: 0 .25em 0 0;
+}
 q:before,
 q:after {
     content: '';
@@ -320,7 +356,7 @@ select:focus {
 input[type=radio],
 input[type=checkbox] {
     padding: 0;
-    border-width: 0;
+    border-style: none;
     box-shadow: none;
 }
 
@@ -343,6 +379,10 @@ button,
     padding: .1em .5em;
     cursor: pointer;
 }
+#IE7 input.button,
+#IE7 button {
+    line-height: 1.4;
+}
 
 input[type=submit]:hover,
 input[type=submit]:active,
@@ -379,39 +419,3 @@ input[readonly],
 button[readonly] {
     cursor: auto;
 }
-
-/*____________ rtl corrections ____________*/
-
-[dir=rtl] caption,
-[dir=rtl] td,
-[dir=rtl] th {
-    text-align: right;
-}
-
-[dir=rtl] ul,
-[dir=rtl] ol {
-    padding: 0 1.5em 0 0;
-}
-[dir=rtl] li,
-[dir=rtl] dd {
-    margin: 0 1.5em 0 0;
-}
-[dir=rtl] blockquote {
-    border-width: 0 .25em 0 0;
-}
-
-[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;
-}
-
-[dir=rtl] .a11y {
-    left: auto;
-    right: -9000px;
-}
diff --git a/lib/tpl/dokuwiki/css/content.css b/lib/tpl/dokuwiki/css/content.css
index ebeb4e17e..c23612643 100644
--- a/lib/tpl/dokuwiki/css/content.css
+++ b/lib/tpl/dokuwiki/css/content.css
@@ -6,7 +6,6 @@
  * @author Clarence Lee <clarencedglee@gmail.com>
  */
 
-
 /*____________ section indenting ____________
 
 .dokuwiki.page  h1 {margin-left: 0;}
@@ -34,6 +33,20 @@
 /* hx margin-left = (1 / font-size) * .levelx-margin */
 
 
+/*____________ links to wiki pages (addition to _links) ____________*/
+
+/* existing wikipage */
+.dokuwiki a.wikilink1 {
+    color: __existing__;
+    background-color: inherit;
+}
+/* not existing wikipage */
+.dokuwiki a.wikilink2 {
+    color: __missing__;
+    background-color: inherit;
+}
+
+
 /*____________ images ____________*/
 
 /* embedded images (styles are already partly set in lib/styles/all.css) */
@@ -69,8 +82,8 @@
 
 /*____________ tables ____________*/
 
+/* div around each table */
 .dokuwiki div.table {
-    width: 100%;
     overflow-x: auto;
     margin-bottom: 1.4em;
 }
@@ -80,17 +93,6 @@
 
 .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__;
@@ -102,22 +104,11 @@
 
 /*____________ 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 {
 }
@@ -129,15 +120,15 @@
 
 .dokuwiki dl.code dt,
 .dokuwiki dl.file dt {
-    background-color: __background_alt__;
-    /*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%);
-    background: linear-gradient(        top, __background__ 0%, __background_alt__ 100%);
+    background-color: __background_site__;
+    /* background: -moz-linear-gradient(   top, __background_alt__ 0%, __background_site__ 100%); see FS#2447 */
+    background: -webkit-linear-gradient(top, __background_alt__ 0%, __background_site__ 100%);
+    background: -o-linear-gradient(     top, __background_alt__ 0%, __background_site__ 100%);
+    background: -ms-linear-gradient(    top, __background_alt__ 0%, __background_site__ 100%);
+    background: linear-gradient(        top, __background_alt__ 0%, __background_site__ 100%);
     color: inherit;
     border: 1px solid __border__;
-    border-bottom-color: __background_alt__;
+    border-bottom-color: __background_site__;
     border-top-left-radius: .3em;
     border-top-right-radius: .3em;
     padding: .3em .6em .1em;
@@ -146,8 +137,7 @@
 }
 [dir=rtl] .dokuwiki dl.code dt,
 [dir=rtl] .dokuwiki dl.file dt {
-    margin-left: 0;
-    margin-right: 1em;
+    float: right;
 }
 .dokuwiki dl.code dt a,
 .dokuwiki dl.file dt a {
@@ -157,9 +147,216 @@
     display: block;
     min-height: 16px;
 }
+
 .dokuwiki dl.code dd,
 .dokuwiki dl.file dd {
     margin: 0;
     clear: left;
+    min-height: 1px; /* for IE7 */
+}
+[dir=rtl] .dokuwiki dl.code dd,
+[dir=rtl] .dokuwiki dl.file dd {
+    clear: right;
+}
+
+.dokuwiki dl.code pre,
+.dokuwiki dl.file pre {
+    box-shadow: inset -4px -4px .5em -.3em __border__;
+}
+
+
+/*____________ 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;
+}
+[dir=rtl] .JSpopup ul,
+[dir=rtl] .JSpopup ol {
+    padding-right: 0;
+}
+
+
+/* changes to underscored CSS files
+********************************************************************/
+
+#acl__tree li {
+    margin: 0;
+}
+
+#dokuwiki__content span.curid a {
+    font-weight: normal;
+}
+#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;
+}
+[dir=rtl] .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-right-radius: 4px;
+    border-bottom-right-radius: 4px;
+}
+[dir=rtl] .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: 0 -2em;
+    padding: 0 1em;
+    border-width: 0 1em;
+}
+
+.dokuwiki textarea.edit {
+    font-family: Consolas, "Andale Mono WT", "Andale Mono", "Bitstream Vera Sans Mono", "Nimbus Mono L", Monaco, "Courier New", monospace;
+}
+
+.dokuwiki div.preview {
+    margin: 0 -2em;
+    padding: 0 2em;
+}
+.dokuwiki.hasSidebar div.preview {
+    border-right: __sidebar_width__ solid __background_alt__;
+}
+[dir=rtl] .dokuwiki.hasSidebar div.preview {
+    border-right-width: 0;
+    border-left: __sidebar_width__ solid __background_alt__;
+}
+.dokuwiki div.preview div.pad {
+    padding: 1.556em 0 2em;
+}
+
+
+/*____________ changes to _toc ____________*/
+
+#dw__toc {
+    margin:  -1.556em -2em .5em 1.4em;
+    width: __sidebar_width__;
+    border-left: 1px solid __border__;
+    background: __background__;
+    color: inherit;
+}
+[dir=rtl] #dw__toc {
+    margin: -1.556em 1.4em .5em -2em;
+    border-left-width: 0;
+    border-right: 1px solid __border__;
+}
+
+.dokuwiki h3.toggle {
+    padding: .5em 1em;
+    margin-bottom: 0;
+    font-size: .875em;
+    letter-spacing: .1em;
+}
+#dokuwiki__aside h3.toggle {
+    display: none;
+}
+
+.dokuwiki .toggle strong {
+    background: transparent url(images/toc-arrows.png) 0 0;
+    width: 8px;
+    height: 5px;
+    margin: .4em 0 0;
+}
+.dokuwiki .toggle.closed strong {
+    background-position: 0 -5px;
+}
+
+.dokuwiki .toggle strong span {
+    display: none;
+}
+
+
+#dw__toc > div {
+    font-size: 0.875em;
+    padding: .5em 1em 1em;
+}
+#dw__toc ul {
+    padding: 0 0 0 1.2em;
+}
+[dir=rtl] #dw__toc ul {
+    padding: 0 1.5em 0 0;
+}
+#dw__toc ul li {
+    list-style-image: url(images/toc-bullet.png);
+}
+#dw__toc ul li.clear {
+    list-style: none;
+}
+#dw__toc 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;
+}
+[dir=rtl] #dokuwiki__detail div.img_detail dl dt {
+    float: right;
+    text-align: left;
+    clear: right;
+}
+#dokuwiki__detail div.img_detail dl dd {
+    margin-left: 9.5em;
+}
+[dir=rtl] #dokuwiki__detail div.img_detail dl dd {
+    margin-left: 0;
+    margin-right: 9.5em;
+}
diff --git a/lib/tpl/dokuwiki/css/design.css b/lib/tpl/dokuwiki/css/design.css
index 12ec80687..2c2109228 100644
--- a/lib/tpl/dokuwiki/css/design.css
+++ b/lib/tpl/dokuwiki/css/design.css
@@ -264,7 +264,8 @@
 /* make sidebar more condensed */
 
 #dokuwiki__aside h1 {
-    margin-bottom: .222em;
+    font-size: 1.714em;
+    margin-bottom: .292em;
 }
 #dokuwiki__aside h2 {
     margin-bottom: .333em;
@@ -294,15 +295,16 @@
 
 #dokuwiki__aside ul,
 #dokuwiki__aside ol {
-    padding-left: 0;
+    padding-left: .5em;
 }
 [dir=rtl] #dokuwiki__aside ul,
 [dir=rtl] #dokuwiki__aside ol {
-    padding-right: 0;
+    padding-right: .5em;
 }
 #dokuwiki__aside li ul,
 #dokuwiki__aside li ol {
     margin-bottom: 0;
+    padding: 0;
 }
 
 #dokuwiki__aside a:link,
@@ -362,215 +364,11 @@
     text-align: left;
 }
 
-/*____________ misc ____________*/
-
 /* license note under edit window */
 .dokuwiki div.license {
     font-size: 93.75%;
 }
 
-#IE7 .dokuwiki input.button,
-#IE7 .dokuwiki button {
-    line-height: 1.4;
-}
-
-#acl__tree li {
-    margin: 0;
-}
-
-#dokuwiki__content span.curid a {
-    font-weight: normal;
-}
-#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;
-}
-[dir=rtl] .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-right-radius: 4px;
-    border-bottom-right-radius: 4px;
-}
-[dir=rtl] .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: -3em -2em -.01em -2em;
-    padding: 3em 1em .01em 1em;
-    border-width: 0 1em;
-}
-[dir=rtl] .dokuwiki div.section_highlight {
-    margin-right: -2em;
-    border-right-width: 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: 0 2em;
-}
-.dokuwiki.hasSidebar div.preview {
-    border-right: __sidebar_width__ solid __background_alt__;
-}
-[dir=rtl] .dokuwiki.hasSidebar div.preview {
-    border-right-width: 0;
-    border-left: __sidebar_width__ solid __background_alt__;
-}
-.dokuwiki div.preview div.pad {
-    padding: 1.556em 0 2em;
-}
-
-
-/*____________ changes to _toc ____________*/
-
-#dw__toc {
-    margin:  -1.556em -2em .5em 1.4em;
-    width: __sidebar_width__;
-    border-left: 1px solid __border__;
-    background: __background__;
-    color: inherit;
-}
-[dir=rtl] #dw__toc {
-    margin: -1.556em 1.4em .5em -2em;
-    border-left-width: 0;
-    border-right: 1px solid __border__;
-}
-
-.dokuwiki h3.toggle {
-    padding: .5em 1em;
-    margin-bottom: 0;
-    font-size: .875em;
-    letter-spacing: .1em;
-}
-#dokuwiki__aside h3.toggle {
-    display: none;
-}
-
-.dokuwiki .toggle strong {
-    background: transparent url(images/toc-arrows.png) 0 0;
-    width: 8px;
-    height: 5px;
-    margin: .4em 0 0;
-}
-.dokuwiki .toggle.closed strong {
-    background-position: 0 -5px;
-}
-
-.dokuwiki .toggle strong span {
-    display: none;
-}
-
-
-#dw__toc > div {
-    font-size: 0.875em;
-    padding: .5em 1em 1em;
-}
-#dw__toc ul {
-    padding: 0 0 0 1.2em;
-}
-[dir=rtl] #dw__toc ul {
-    padding: 0 1.5em 0 0;
-}
-#dw__toc ul li {
-    list-style-image: url(images/toc-bullet.png);
-}
-#dw__toc ul li.clear {
-    list-style: none;
-}
-#dw__toc 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;
-}
-[dir=rtl] #dokuwiki__detail div.img_detail dl dt {
-    float: right;
-    text-align: left;
-    clear: right;
-}
-#dokuwiki__detail div.img_detail dl dd {
-    margin-left: 9.5em;
-}
-[dir=rtl] #dokuwiki__detail div.img_detail dl dd {
-    margin-left: 0;
-    margin-right: 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;
-}
-[dir=rtl] .JSpopup ul,
-[dir=rtl] .JSpopup ol {
-    padding-right: 0;
-}
-
 
 /* footer
 ********************************************************************/
diff --git a/lib/tpl/dokuwiki/css/mobile.css b/lib/tpl/dokuwiki/css/mobile.css
index 6e07f23ec..501e53a54 100644
--- a/lib/tpl/dokuwiki/css/mobile.css
+++ b/lib/tpl/dokuwiki/css/mobile.css
@@ -5,10 +5,20 @@
  * @author Anika Henke <anika@selfthinker.org>
  */
 
+/* for detecting media queries in JavaScript (see script.js): */
+#screen__mode {
+    position: relative;
+    z-index: 0;
+}
+
 /* up to 979px screen widths
 ********************************************************************/
 @media only screen and (max-width: 979px) {
 
+#screen__mode {
+    z-index: 1; /* for detecting media queries in JavaScript (see script.js) */
+}
+
 /* structure */
 #dokuwiki__aside {
     width: 100%;
@@ -82,8 +92,8 @@
 
 /* _edit */
 .dokuwiki div.section_highlight {
-    margin: -3em -1em -.01em -1em;
-    padding: 3em .5em .01em .5em;
+    margin: 0 -1em;
+    padding: 0 .5em;
     border-width: 0 .5em;
 }
 .dokuwiki div.preview {
@@ -107,6 +117,10 @@
 ********************************************************************/
 @media only screen and (max-width: 480px) {
 
+#screen__mode {
+    z-index: 2; /* for detecting media queries in JavaScript (see script.js) */
+}
+
 body {
     font-size: 100%;
 }
diff --git a/lib/tpl/dokuwiki/css/plugins.css b/lib/tpl/dokuwiki/css/plugins.css
deleted file mode 100644
index e69de29bb..000000000
--- a/lib/tpl/dokuwiki/css/plugins.css
+++ /dev/null
diff --git a/lib/tpl/dokuwiki/css/print.css b/lib/tpl/dokuwiki/css/print.css
index 191d50c28..d30bc6c91 100644
--- a/lib/tpl/dokuwiki/css/print.css
+++ b/lib/tpl/dokuwiki/css/print.css
@@ -14,16 +14,11 @@ body {
 
 /* hide certain sections */
 .a11y,
-div.notify,
-div.info,
-div.success,
-div.error,
 #dokuwiki__header .tools,
 #dokuwiki__aside,
 .dokuwiki .breadcrumbs,
 #dw__toc,
 h3.toggle,
-.dokuwiki .secedit,
 #dokuwiki__pagetools,
 #dokuwiki__footer {
     display: none;
@@ -57,14 +52,11 @@ h3.toggle,
     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 */
@@ -94,42 +86,12 @@ a.mail:after {
 }
 .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;
-}
-
-/* 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 {
diff --git a/lib/tpl/dokuwiki/css/rtl.css b/lib/tpl/dokuwiki/css/rtl.css
deleted file mode 100644
index e69de29bb..000000000
--- a/lib/tpl/dokuwiki/css/rtl.css
+++ /dev/null