Merge branch 'master' into proxyconnect

* master: (169 commits)
  added PCRE UTF-8 checks to do=check FS#2636
  avoid multiple paralell update checks
  fix regression bug in HTTPClient FS#2621
  changed PAGEUTILS_ID_HIDEPAGE to has BEFORE/AFTER
  TarLib code cleanup
  TarLib: fixed appending in non-dynamic mode
  fixed third method of adding files in TarLib
  fix lone zero block in TarLib created archives
  fix use of constructor in TarLib
  Slovak language update
  Korean language update
  Latvian language update
  added event PAGEUTILS_ID_HIDEPAGE
  added test for isHiddenPage()
  removed redundant variables in tpl_include_page() (because of 3ff8773b)
  added cut off points for mobile devices as parameters to style.ini
  Corrected typo: ruke -> rule
  Persian language update
  Spanish language update
  russian language update
  ...

34 files changed, 556 insertions, 385 deletions

diff --git a/lib/tpl/default/_mediamanager.css b/lib/tpl/default/_mediamanager.css
index 8c605f69a..2ce345e40 100644
--- a/lib/tpl/default/_mediamanager.css
+++ b/lib/tpl/default/_mediamanager.css
@@ -36,6 +36,10 @@
     min-height: 20px;
     overflow: hidden;
 }
+[dir=rtl] #mediamanager__page .panelContent {
+    text-align: right;
+}
+
 
 #mediamanager__page .panelContent {
     overflow-y: auto;
@@ -62,6 +66,10 @@
 
 /*____________ Namespaces tree ____________*/
 
+[dir=rtl] #mediamanager__page .namespaces {
+    text-align: right;
+}
+
 #mediamanager__page .namespaces h2 {
     font-size: 1em;
     display: inline-block;
@@ -78,14 +86,32 @@
 *+html #mediamanager__page .namespaces h2 {
     display: inline;
 }
+[dir=rtl] #mediamanager__page .namespaces h2 {
+    margin-right: 10px;
+}
 
 #mediamanager__page .namespaces ul {
     margin-left: .2em;
+    margin-bottom: 0;
+    padding: 0;
     list-style: none;
 }
+[dir=rtl] #mediamanager__page .namespaces ul {
+    margin-left: 0;
+    margin-right: .2em;
+}
+
 #mediamanager__page .namespaces ul ul {
     margin-left: 1em;
 }
+[dir=rtl] #mediamanager__page .namespaces ul ul {
+    margin-left: 0;
+    margin-right: 1em;
+}
+#mediamanager__page .namespaces ul ul li {
+    margin: 0;
+}
+
 
 #mediamanager__page .namespaces ul .selected {
     background-color: __highlight__;
@@ -143,6 +169,9 @@
     padding: 0;
     margin: 0;
 }
+[dir=rtl] #mediamanager__page .filelist ul.tabs {
+    margin-right: 10px;
+}
 
 #mediamanager__page .filelist .panelContent ul li:hover {
     background-color: __background_alt__;
@@ -179,6 +208,10 @@
     position: relative;
     line-height: 1.2;
 }
+[dir=rtl] #mediamanager__page .filelist .thumbs li {
+    margin-right: 0;
+    margin-left: 6px;
+}
 * html #mediamanager__page .filelist .thumbs li,
 *+html #mediamanager__page .filelist .thumbs li {
     display: inline;
@@ -201,6 +234,7 @@
 #mediamanager__page .filelist .thumbs li .date {
     display: block;
     overflow: hidden;
+    text-overflow: ellipsis;
     width: 90px;
     white-space: nowrap;
 }
@@ -253,6 +287,7 @@
 #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;
@@ -325,6 +360,9 @@
 #mediamanager__page form.meta label span {
     display: block;
 }
+[dir=rtl] #mediamanager__page form.meta label span {
+    text-align: right;
+}
 
 #mediamanager__page form.meta input {
     width: 50%;
@@ -373,6 +411,10 @@
     vertical-align: top;
     text-align: left;
 }
+[dir=rtl] #mediamanager__diff td,
+[dir=rtl] #mediamanager__diff th {
+    text-align: right;
+}
 
 #mediamanager__diff th {
     font-weight: normal;
@@ -405,10 +447,6 @@
 #mediamanager__diff .imageDiff {
     position: relative;
 }
-#mediamanager__diff .imageDiff .image1,
-#mediamanager__diff .imageDiff .image2 {
-    width: 97%;
-}
 #mediamanager__diff .imageDiff .image2 {
     position: absolute;
     top: 0;
@@ -426,7 +464,12 @@
     overflow: hidden;
 }
 
+#mediamanager__diff .imageDiff.portions img {
+    float: left;
+}
+
 #mediamanager__diff .imageDiff img {
     width: 100%;
+    max-width: none;
 }
 
diff --git a/lib/tpl/default/_tabs.css b/lib/tpl/default/_tabs.css
index 8bfb676a0..a39b43441 100644
--- a/lib/tpl/default/_tabs.css
+++ b/lib/tpl/default/_tabs.css
@@ -10,6 +10,9 @@
     margin: 0;
     list-style: none;
 }
+[dir=rtl] .dokuwiki ul.tabs li {
+    float: right;
+}
 
 .dokuwiki ul.tabs li strong,
 .dokuwiki ul.tabs li a {
@@ -20,6 +23,16 @@
     color: __text__;
     border-radius: .5em .5em 0 0;
 }
+[dir=rtl] .dokuwiki ul.tabs li strong,
+[dir=rtl] .dokuwiki ul.tabs li a {
+    float: right;
+    margin: 0 0 0 .3em;
+}
+*+html[dir=rtl] .dokuwiki ul.tabs li strong,
+*+html[dir=rtl] .dokuwiki ul.tabs li a {
+    float: none;
+    display: inline-block;
+}
 .dokuwiki ul.tabs li strong {
     font-weight: normal;
 }
diff --git a/lib/tpl/default/media.css b/lib/tpl/default/media.css
index 37369fe2f..640ad3162 100644
--- a/lib/tpl/default/media.css
+++ b/lib/tpl/default/media.css
@@ -42,18 +42,29 @@
     float: left;
     padding: 0.5em 0.3em 0 0;
 }
+[dir=rtl] #media__tree img {
+    float: right;
+    padding: 0.5em 0 0 0.3em;
+}
 
 #media__tree ul {
     list-style-type: none;
     list-style-image: none;
     margin-left: 1.5em;
 }
+[dir=rtl] #media__tree ul {
+    margin-left: 0;
+    margin-right: 1.5em;
+}
 
 #media__tree li {
     clear: left;
     list-style-type: none;
     list-style-image: none;
 }
+[dir=rtl] #media__tree li {
+    clear: right;
+}
 *+html #media__tree li,
 * html #media__tree li {
     border: 1px solid __background__;
diff --git a/lib/tpl/default/rtl.css b/lib/tpl/default/rtl.css
index 8b2837874..f16ba101b 100644
--- a/lib/tpl/default/rtl.css
+++ b/lib/tpl/default/rtl.css
@@ -54,15 +54,17 @@ div.dokuwiki li ol {
 
 div.dokuwiki a.urlextern,
 div.dokuwiki a.interwiki,
+div.dokuwiki a.mediafile,
 div.dokuwiki a.windows,
 div.dokuwiki a.mail {
-  /* 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;
+  padding-left: 0;
+  display: inline-block; /* needed for IE7 */
+}
+
+div.dokuwiki a.mediafile {
+  padding-right: 18px;
 }
 
 div.dokuwiki div.secedit input.button {
diff --git a/lib/tpl/default/style.ini b/lib/tpl/default/style.ini
index 7d27381c9..0706303d0 100644
--- a/lib/tpl/default/style.ini
+++ b/lib/tpl/default/style.ini
@@ -1,6 +1,11 @@
 ; Please see http://www.php.net/manual/en/function.parse-ini-file.php
 ; for limitations of the ini format used here
 
+; To extend this file or make changes to it, it is recommended to create
+; a style.local.ini file to prevent losing any changes after an upgrade.
+; Please don't forget to copy the section your changes should be under
+; (i.e. [stylesheets] or [replacements]) into that file as well.
+
 ; Define the stylesheets your template uses here. The second value
 ; defines for which output media the style should be loaded. Currently
 ; print, screen and rtl are supported. rtl styles are loaded additionally
diff --git a/lib/tpl/default/template.info.txt b/lib/tpl/default/template.info.txt
new file mode 100644
index 000000000..a77289e58
--- /dev/null
+++ b/lib/tpl/default/template.info.txt
@@ -0,0 +1,7 @@
+base     default
+author   Andreas Gohr
+email    andi@splitbrain.org
+date     2012-09-08
+name     DokuWiki Default Template
+desc     DokuWiki's default template until 2012
+url      http://www.dokuwiki.org/template:default
diff --git a/lib/tpl/dokuwiki/css/_edit.css b/lib/tpl/dokuwiki/css/_edit.css
index 374ddeb96..0c66c75b7 100644
--- a/lib/tpl/dokuwiki/css/_edit.css
+++ b/lib/tpl/dokuwiki/css/_edit.css
@@ -26,6 +26,9 @@
 #tool__bar {
     float: left;
 }
+[dir=rtl] #tool__bar {
+    float: right;
+}
 
 /* buttons inside of toolbar */
 .dokuwiki div.toolbar button.toolbutton {
@@ -132,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/_forms.css b/lib/tpl/dokuwiki/css/_forms.css
index fb07e989a..3c7172226 100644
--- a/lib/tpl/dokuwiki/css/_forms.css
+++ b/lib/tpl/dokuwiki/css/_forms.css
@@ -36,6 +36,7 @@
     text-align: right;
 }
 
+.dokuwiki label.block select,
 .dokuwiki label.block input.edit {
   width: 50%;
 }
diff --git a/lib/tpl/dokuwiki/css/_links.css b/lib/tpl/dokuwiki/css/_links.css
index 22502f6a9..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 */
@@ -70,4 +66,5 @@
 [dir=rtl] .dokuwiki a.mediafile {
     background-position: right center;
     padding: 0 18px 0 0;
+    display: inline-block; /* needed for IE7 */
 }
diff --git a/lib/tpl/dokuwiki/css/_media_fullscreen.css b/lib/tpl/dokuwiki/css/_media_fullscreen.css
index 9054ab26f..8d5e1e8ca 100644
--- a/lib/tpl/dokuwiki/css/_media_fullscreen.css
+++ b/lib/tpl/dokuwiki/css/_media_fullscreen.css
@@ -53,6 +53,9 @@
     margin: 0 10px 10px 0;
     position: relative;
 }
+[dir=rtl] #mediamanager__page .panelContent {
+    text-align: right;
+}
 
 #mediamanager__page .file .panelHeader,
 #mediamanager__page .file .panelContent {
@@ -62,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__;
@@ -84,22 +87,40 @@
 
 /*____________ namespaces panel ____________*/
 
+[dir=rtl] #mediamanager__page .namespaces {
+    text-align: right;
+}
+
+/* make it look like a tab (as in _tabs.css) */
 #mediamanager__page .namespaces h2 {
     font-size: 1em;
     display: inline-block;
-    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: 0 .3em 0 0;
+    position: relative;
+    right: 10px;
+}
+#mediamanager__page .namespaces .panelHeader {
+    border-top: 1px solid __border__;
+    z-index: 1;
+}
 
 #mediamanager__page .namespaces ul {
     margin-left: .2em;
@@ -107,9 +128,17 @@
     padding: 0;
     list-style: none;
 }
+[dir=rtl] #mediamanager__page .namespaces ul {
+    margin-left: 0;
+    margin-right: .2em;
+}
 #mediamanager__page .namespaces ul ul {
     margin-left: 1em;
 }
+[dir=rtl] #mediamanager__page .namespaces ul ul {
+    margin-left: 0;
+    margin-right: 1em;
+}
 #mediamanager__page .namespaces ul ul li {
     margin: 0;
 }
@@ -140,13 +169,19 @@
     line-height: 1;
     padding-left: 3px;
 }
+[dir=rtl] #mediamanager__page .panelHeader ul li {
+    margin-right: 0;
+    margin-left: .5em;
+}
 
 #mediamanager__page .panelHeader ul li.listType {
     padding-left: 30px;
+    margin: 0 0 0 5px;
     background: url('../../images/icon-list.png') 3px 1px no-repeat;
 }
 #mediamanager__page .panelHeader ul li.sortBy {
     padding-left: 30px;
+    margin: 0 0 0 5px;
     background: url('../../images/icon-sort.png') 3px 1px no-repeat;
 }
 
@@ -163,7 +198,10 @@
 
 #mediamanager__page .filelist ul {
     padding: 0;
-    margin: 0;
+    margin: 0 10px 0 0;
+}
+[dir=rtl] #mediamanager__page .filelist ul {
+    margin: 0 10px 0 0;
 }
 
 #mediamanager__page .filelist .panelContent ul li:hover {
@@ -201,6 +239,10 @@
     position: relative;
     line-height: 1.2;
 }
+[dir=rtl] #mediamanager__page .filelist .thumbs li {
+    margin-right: 0;
+    margin-left: 6px;
+}
 * html #mediamanager__page .filelist .thumbs li,
 *+html #mediamanager__page .filelist .thumbs li {
     display: inline;
@@ -398,6 +440,10 @@
     text-align: left;
     border-color: __background__;
 }
+[dir=rtl] #mediamanager__diff td,
+[dir=rtl] #mediamanager__diff th {
+    text-align: right;
+}
 
 #mediamanager__diff th {
     font-weight: normal;
@@ -432,10 +478,6 @@
 #mediamanager__diff .imageDiff {
     position: relative;
 }
-#mediamanager__diff .imageDiff .image1,
-#mediamanager__diff .imageDiff .image2 {
-    width: 97%;
-}
 #mediamanager__diff .imageDiff .image2 {
     position: absolute;
     top: 0;
@@ -451,6 +493,10 @@
     overflow: hidden;
 }
 
+#mediamanager__diff .imageDiff.portions img {
+    float: left;
+}
+
 #mediamanager__diff .imageDiff img {
     width: 100%;
     max-width: none;
diff --git a/lib/tpl/dokuwiki/css/_tabs.css b/lib/tpl/dokuwiki/css/_tabs.css
index de544fd2b..845ec9a57 100644
--- a/lib/tpl/dokuwiki/css/_tabs.css
+++ b/lib/tpl/dokuwiki/css/_tabs.css
@@ -2,27 +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 {
+    margin: 0 .3em 0 0;
 }
+
 .dokuwiki ul.tabs li strong {
     font-weight: normal;
 }
@@ -30,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,
@@ -37,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 d683603ae..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 ____________*/
@@ -188,11 +213,15 @@ img {
     color: #666;
     background-color: transparent;
     font-style: italic;
+    height: auto;
 }
 img,
 object {
     max-width: 100%;
-    height: auto;
+}
+/* IE8 and below won't display the images otherwise */
+button img {
+    max-width: none;
 }
 
 hr {
@@ -221,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 {
@@ -232,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: '';
@@ -316,7 +356,7 @@ select:focus {
 input[type=radio],
 input[type=checkbox] {
     padding: 0;
-    border-width: 0;
+    border-style: none;
     box-shadow: none;
 }
 
@@ -339,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,
@@ -375,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 d1a00ce0a..2c2109228 100644
--- a/lib/tpl/dokuwiki/css/design.css
+++ b/lib/tpl/dokuwiki/css/design.css
@@ -103,6 +103,10 @@
     padding-left: 0;
     padding-right: 20px;
 }
+[dir=rtl] #IE7 #dokuwiki__usertools a.action {
+    display: inline-block;
+}
+
 
 #dokuwiki__header .mobileTools {
     display: none; /* hide mobile tools dropdown to only show in mobile view */
@@ -176,6 +180,10 @@
     font-size: 0.875em;
     position: relative;
 }
+#IE7 #dokuwiki__sitetools form.search {
+    min-height: 1px;
+    z-index: 21;
+}
 #dokuwiki__sitetools form.search input.edit {
     width: 18em;
     padding: .35em 22px .35em .1em;
@@ -256,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;
@@ -286,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,
@@ -354,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..88333c012 100644
--- a/lib/tpl/dokuwiki/css/mobile.css
+++ b/lib/tpl/dokuwiki/css/mobile.css
@@ -5,9 +5,19 @@
  * @author Anika Henke <anika@selfthinker.org>
  */
 
-/* up to 979px screen widths
+/* for detecting media queries in JavaScript (see script.js): */
+#screen__mode {
+    position: relative;
+    z-index: 0;
+}
+
+/* for screen widths in the tablet range
 ********************************************************************/
-@media only screen and (max-width: 979px) {
+@media only screen and (max-width: __tablet_width__) {
+
+#screen__mode {
+    z-index: 1; /* for detecting media queries in JavaScript (see script.js) */
+}
 
 /* structure */
 #dokuwiki__aside {
@@ -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 {
@@ -103,9 +113,13 @@
 } /* /@media */
 
 
-/* up to 480px screen widths
+/* for screen widths in the smartphone range
 ********************************************************************/
-@media only screen and (max-width: 480px) {
+@media only screen and (max-width: __phone_width__) {
+
+#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/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/images/bullet.png b/lib/tpl/dokuwiki/images/bullet.png
deleted file mode 100644
index 5e557b334..000000000
--- a/lib/tpl/dokuwiki/images/bullet.png
+++ /dev/null
diff --git a/lib/tpl/dokuwiki/images/button-html5.png b/lib/tpl/dokuwiki/images/button-html5.png
new file mode 100644
index 000000000..5885a331b
--- /dev/null
+++ b/lib/tpl/dokuwiki/images/button-html5.png
diff --git a/lib/tpl/dokuwiki/images/button-xhtml.png b/lib/tpl/dokuwiki/images/button-xhtml.png
deleted file mode 100644
index ec686442c..000000000
--- a/lib/tpl/dokuwiki/images/button-xhtml.png
+++ /dev/null
diff --git a/lib/tpl/dokuwiki/images/closed-rtl.png b/lib/tpl/dokuwiki/images/closed-rtl.png
deleted file mode 100644
index caa027e34..000000000
--- a/lib/tpl/dokuwiki/images/closed-rtl.png
+++ /dev/null
diff --git a/lib/tpl/dokuwiki/images/closed.png b/lib/tpl/dokuwiki/images/closed.png
deleted file mode 100644
index e3bd0f9e9..000000000
--- a/lib/tpl/dokuwiki/images/closed.png
+++ /dev/null
diff --git a/lib/tpl/dokuwiki/images/email.png b/lib/tpl/dokuwiki/images/email.png
deleted file mode 100644
index d1d4a5fd5..000000000
--- a/lib/tpl/dokuwiki/images/email.png
+++ /dev/null
diff --git a/lib/tpl/dokuwiki/images/external-link.png b/lib/tpl/dokuwiki/images/external-link.png
deleted file mode 100644
index a4d5de17c..000000000
--- a/lib/tpl/dokuwiki/images/external-link.png
+++ /dev/null
diff --git a/lib/tpl/dokuwiki/images/icons-license.txt b/lib/tpl/dokuwiki/images/license.txt
index 7e12bbbd4..7d12604b6 100644
--- a/lib/tpl/dokuwiki/images/icons-license.txt
+++ b/lib/tpl/dokuwiki/images/license.txt
@@ -1,4 +1,4 @@
-Icons for:  sitetools.png, email.png, external-link.png and unc.png
+Icons for:  sitetools.png
 Icon set:   Dusseldorf
 Designer:   pc.de
 License:    Creative Commons Attribution License [http://creativecommons.org/licenses/by/3.0/]
diff --git a/lib/tpl/dokuwiki/images/open.png b/lib/tpl/dokuwiki/images/open.png
deleted file mode 100644
index 5f2d408c5..000000000
--- a/lib/tpl/dokuwiki/images/open.png
+++ /dev/null
diff --git a/lib/tpl/dokuwiki/images/resizecol.png b/lib/tpl/dokuwiki/images/resizecol.png
deleted file mode 100644
index b5aeec004..000000000
--- a/lib/tpl/dokuwiki/images/resizecol.png
+++ /dev/null
diff --git a/lib/tpl/dokuwiki/images/unc.png b/lib/tpl/dokuwiki/images/unc.png
deleted file mode 100644
index a552d6e6f..000000000
--- a/lib/tpl/dokuwiki/images/unc.png
+++ /dev/null
diff --git a/lib/tpl/dokuwiki/main.php b/lib/tpl/dokuwiki/main.php
index 2406a206b..963750a1c 100644
--- a/lib/tpl/dokuwiki/main.php
+++ b/lib/tpl/dokuwiki/main.php
@@ -42,7 +42,7 @@ $showSidebar = $hasSidebar && ($ACT=='show');
                     <div class="content">
                         <?php tpl_flush() ?>
                         <?php tpl_includeFile('sidebarheader.html') ?>
-                        <?php tpl_sidebar() ?>
+                        <?php tpl_include_page($conf['sidebar'], 1, 1) ?>
                         <?php tpl_includeFile('sidebarfooter.html') ?>
                     </div>
                 </div></div><!-- /aside -->
@@ -91,6 +91,7 @@ $showSidebar = $hasSidebar && ($ACT=='show');
     </div></div><!-- /site -->
 
     <div class="no"><?php tpl_indexerWebBug() /* provide DokuWiki housekeeping, required in all templates */ ?></div>
+    <div id="screen__mode" class="no"></div><?php /* helper to detect CSS media query in script.js */ ?>
     <!--[if ( lte IE 7 | IE 8 ) ]></div><![endif]-->
 </body>
 </html>
diff --git a/lib/tpl/dokuwiki/script.js b/lib/tpl/dokuwiki/script.js
index d858bda89..3ed8dbabe 100644
--- a/lib/tpl/dokuwiki/script.js
+++ b/lib/tpl/dokuwiki/script.js
@@ -12,18 +12,23 @@ var device_classes = 'desktop mobile tablet phone';
 
 function tpl_dokuwiki_mobile(){
 
+    // the z-index in mobile.css is (mis-)used purely for detecting the screen mode here
+    var screen_mode = jQuery('#screen__mode').css('z-index');
+
     // determine our device pattern
     // TODO: consider moving into dokuwiki core
-    var w = document.body.clientWidth;
-    if (w > 979) {
-        if (device_class == 'desktop') return;
-        device_class = 'desktop';
-    } else if (w > 480) {
-        if (device_class.match(/tablet/)) return;
-        device_class = 'mobile tablet';
-    } else {
-        if (device_class.match(/phone/)) return;
-        device_class = 'mobile phone';
+    switch (screen_mode) {
+        case '1':
+            if (device_class.match(/tablet/)) return;
+            device_class = 'mobile tablet';
+            break;
+        case '2':
+            if (device_class.match(/phone/)) return;
+            device_class = 'mobile phone';
+            break;
+        default:
+            if (device_class == 'desktop') return;
+            device_class = 'desktop';
     }
 
     jQuery('html').removeClass(device_classes).addClass(device_class);
diff --git a/lib/tpl/dokuwiki/style.ini b/lib/tpl/dokuwiki/style.ini
index 45e68e3ed..67fbb3065 100644
--- a/lib/tpl/dokuwiki/style.ini
+++ b/lib/tpl/dokuwiki/style.ini
@@ -1,10 +1,14 @@
 ; Please see http://www.php.net/manual/en/function.parse-ini-file.php
 ; for limitations of the ini format used here
 
+; To extend this file or make changes to it, it is recommended to create
+; a style.local.ini file to prevent losing any changes after an upgrade.
+; Please don't forget to copy the section your changes should be under
+; (i.e. [stylesheets] or [replacements]) into that file as well.
+
 ; Define the stylesheets your template uses here. The second value
 ; defines for which output media the style should be loaded. Currently
-; print, screen and rtl are supported. rtl styles are loaded additionally
-; to screen styles if a right-to-left language is selected (eg. Hebrew).
+; print, screen and all are supported.
 
 [stylesheets]
 
@@ -55,6 +59,9 @@ __background_neu__  = "#ddd"
 ; border color
 __border__          = "#ccc"
 
+; highlighted text (e.g. search snippets)
+__highlight__       = "#ff9"
+
 ;--------------------------------------------------------------------------
 
 __background_site__ = "#fbfaf9"
@@ -64,9 +71,9 @@ __link__            = "#2b73b7"
 __existing__        = "#080"
 __missing__         = "#d30"
 
-; highlighting search snippets
-__highlight__       = "#ff9"
-
 ; site and sidebar widths
 __site_width__      = "75em"
 __sidebar_width__   = "16em"
+; cut off points for mobile devices
+__tablet_width__    = "979px"
+__phone_width__     = "480px"
diff --git a/lib/tpl/dokuwiki/template.info.txt b/lib/tpl/dokuwiki/template.info.txt
index 3f904c6c8..d32e94d39 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-03-24
+base     dokuwiki
+author   Anika Henke
+email    anika@selfthinker.org
+date     2012-10-26
 name     DokuWiki Template
 desc     DokuWiki's default template since 2012
 url      http://www.dokuwiki.org/template:dokuwiki
diff --git a/lib/tpl/dokuwiki/tpl_footer.php b/lib/tpl/dokuwiki/tpl_footer.php
index 3a2e3d121..b7dc9c631 100644
--- a/lib/tpl/dokuwiki/tpl_footer.php
+++ b/lib/tpl/dokuwiki/tpl_footer.php
@@ -20,8 +20,8 @@ if (!defined('DOKU_INC')) die();
             src="<?php echo tpl_basedir(); ?>images/button-donate.gif" width="80" height="15" alt="Donate" /></a>
         <a href="http://www.php.net" title="Powered by PHP" <?php echo $target?>><img
             src="<?php echo tpl_basedir(); ?>images/button-php.gif" width="80" height="15" alt="Powered by PHP" /></a>
-        <a href="http://validator.w3.org/check/referer" title="Valid XHTML 1.0" <?php echo $target?>><img
-            src="<?php echo tpl_basedir(); ?>images/button-xhtml.png" width="80" height="15" alt="Valid XHTML 1.0" /></a>
+        <a href="http://validator.w3.org/check/referer" title="Valid HTML5" <?php echo $target?>><img
+            src="<?php echo tpl_basedir(); ?>images/button-html5.png" width="80" height="15" alt="Valid HTML5" /></a>
         <a href="http://jigsaw.w3.org/css-validator/check/referer?profile=css3" title="Valid CSS" <?php echo $target?>><img
             src="<?php echo tpl_basedir(); ?>images/button-css.png" width="80" height="15" alt="Valid CSS" /></a>
         <a href="http://dokuwiki.org/" title="Driven by DokuWiki" <?php echo $target?>><img
diff --git a/lib/tpl/index.php b/lib/tpl/index.php
index 357cc1f0d..3c00ab8e8 100644
--- a/lib/tpl/index.php
+++ b/lib/tpl/index.php
@@ -43,7 +43,11 @@ require_once(DOKU_INC.'inc/init.php');
 </head>
 <body>
 <?php
-$ini = @parse_ini_file($conf['template'].'/style.ini',true);
+// get merged style.ini
+define('SIMPLE_TEST', true); // hack to prevent css output and headers
+require_once(DOKU_INC.'lib/exe/css.php');
+$ini = css_styleini(tpl_incdir());
+
 if ($ini) {
     echo '<table>';
     echo "<caption>".htmlspecialchars($conf['template'])."'s style.ini</caption>";
@@ -60,7 +64,7 @@ if ($ini) {
     }
     echo '</table>';
 } else {
-    echo "<p>Non-existent template: <strong>".htmlspecialchars($conf['template'])."</strong></p>";
+    echo "<p>Non-existent or invalid template or style.ini: <strong>".htmlspecialchars($conf['template'])."</strong></p>";
 }
 ?>
 </body>