Merge branch 'master' into configmgr_improvements

Conflicts:
	inc/auth.php
	inc/template.php
	lib/plugins/authad/lang/zh/settings.php
	lib/plugins/authldap/lang/en/settings.php
	lib/plugins/authldap/lang/zh/settings.php
	lib/plugins/authmysql/lang/zh/settings.php
	lib/plugins/config/settings/config.class.php
	lib/plugins/usermanager/admin.php

11 files changed, 130 insertions, 38 deletions

diff --git a/lib/tpl/default/template.info.txt b/lib/tpl/default/template.info.txt
index a77289e58..e0dbf54ba 100644
--- a/lib/tpl/default/template.info.txt
+++ b/lib/tpl/default/template.info.txt
@@ -1,7 +1,7 @@
 base     default
 author   Andreas Gohr
 email    andi@splitbrain.org
-date     2012-09-08
+date     2013-02-16
 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/basic.css b/lib/tpl/dokuwiki/css/basic.css
index a0a60d295..ad04f7c41 100644
--- a/lib/tpl/dokuwiki/css/basic.css
+++ b/lib/tpl/dokuwiki/css/basic.css
@@ -227,7 +227,8 @@ audio {
     max-width: 100%;
 }
 #IE7 img,
-#IE8 img {
+#IE8 img,
+button img {
     max-width: none;
 }
 
diff --git a/lib/tpl/dokuwiki/css/content.css b/lib/tpl/dokuwiki/css/content.css
index 119859e38..b1498d4de 100644
--- a/lib/tpl/dokuwiki/css/content.css
+++ b/lib/tpl/dokuwiki/css/content.css
@@ -8,16 +8,16 @@
 
 /*____________ 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;}
+.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;}
 
 [dir=rtl] .dokuwiki .page h1 {margin-left: 0; margin-right: 0;}
 [dir=rtl] .dokuwiki .page h2 {margin-left: 0; margin-right: .666em;}
diff --git a/lib/tpl/dokuwiki/css/design.css b/lib/tpl/dokuwiki/css/design.css
index 2c2109228..457414839 100644
--- a/lib/tpl/dokuwiki/css/design.css
+++ b/lib/tpl/dokuwiki/css/design.css
@@ -205,6 +205,7 @@
     background-position: 5px 0;
     margin-left: 0;
     margin-right: -20px;
+    position: relative;
 }
 
 #dokuwiki__sitetools ul {
@@ -340,15 +341,15 @@
     padding: .1em .35em;
     border-top-left-radius: 2px;
     border-top-right-radius: 2px;
-    box-shadow: 0 0 .5em #999;
+    box-shadow: 0 0 .5em __text_alt__;
     display: block;
 }
 
 .dokuwiki div.page {
     background: __background__;
     color: inherit;
-    border: 1px solid #eee;
-    box-shadow: 0 0 .5em #999;
+    border: 1px solid __background_alt__;
+    box-shadow: 0 0 .5em __text_alt__;
     border-radius: 2px;
     padding: 1.556em 2em 2em;
     margin-bottom: .5em;
diff --git a/lib/tpl/dokuwiki/css/mobile.css b/lib/tpl/dokuwiki/css/mobile.css
index 88333c012..71f80599d 100644
--- a/lib/tpl/dokuwiki/css/mobile.css
+++ b/lib/tpl/dokuwiki/css/mobile.css
@@ -32,7 +32,7 @@
     background: __background__;
     color: inherit;
     border: 1px solid #eee;
-    box-shadow: 0 0 .5em #999;
+    box-shadow: 0 0 .5em __text_alt__;
     border-radius: 2px;
     padding: 1em;
     margin-bottom: .5em;
@@ -89,6 +89,10 @@
 .dokuwiki div.page {
     padding: 1em;
 }
+/* enable horizontal scrolling in media manager */
+.mode_media div.page {
+    overflow: auto;
+}
 
 /* _edit */
 .dokuwiki div.section_highlight {
diff --git a/lib/tpl/dokuwiki/css/pagetools.css b/lib/tpl/dokuwiki/css/pagetools.css
index 60dc43fb1..21e5c13ec 100644
--- a/lib/tpl/dokuwiki/css/pagetools.css
+++ b/lib/tpl/dokuwiki/css/pagetools.css
@@ -72,45 +72,86 @@
     display: block;
     min-height: 20px; /* 30 - 2x5 */
     line-height: 20px;
-    padding: 5px 40px 5px 5px;
-    background-image: url(images/pagetools-sprite.png);
+    padding: 0;
     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;
+    width: 30px;
+    height: 30px;
+    overflow: hidden;
+    margin-left: auto; /* align right if the ul is larger because one item is focused */
 }
-[dir=rtl] #dokuwiki__pagetools ul li a {
-    padding: 5px 5px 5px 40px;
-    background-position: left 0;
+
+#dokuwiki__pagetools ul li a:before {
+    content: url(images/pagetools-sprite.png);
+    display: inline-block;
+    font-size: 0;
+    line-height: 0;
 }
 
-/* hide labels accessibly when neither on hover nor on focus */
-#dokuwiki__pagetools ul li a span {
-    position: absolute;
-    clip: rect(0 0 0 0); /* IE7, IE6 */
-    clip: rect(0, 0, 0, 0);
+[dir=rtl] #dokuwiki__pagetools ul li a {
+    background-position: left 0;
+    margin-right: auto;
+    margin-left: 0;
 }
 
 /* show all tools on hover and individual tools on focus */
 #dokuwiki__pagetools:hover ul,
-#dokuwiki__pagetools ul li a:focus {
+#dokuwiki__pagetools ul li a:focus,
+#dokuwiki__pagetools ul li a:active {
     background-color: __background__;
     border-color: __border__;
     border-radius: 2px;
     box-shadow: 2px 2px 2px __text_alt__;
 }
+
+#dokuwiki__pagetools:hover ul li a,
+#dokuwiki__pagetools ul li a:focus,
+#dokuwiki__pagetools ul li a:active {
+    width: auto;
+    height: auto;
+    overflow: visible;
+    padding: 5px 40px 5px 5px;
+    background-image: url(images/pagetools-sprite.png);
+}
+
+#dokuwiki__pagetools:hover ul li a:before,
+#dokuwiki__pagetools ul li a:focus:before {
+    content: none;
+}
+
 [dir=rtl] #dokuwiki__pagetools:hover ul,
 [dir=rtl] #dokuwiki__pagetools ul li a:focus {
     box-shadow: -2px 2px 2px __text_alt__;
 }
 
-#dokuwiki__pagetools:hover ul li a span,
-#dokuwiki__pagetools ul li a:focus span {
+[dir=rtl] #dokuwiki__pagetools:hover li a,
+[dir=rtl] #dokuwiki__pagetools ul li a:focus,
+[dir=rtl] #dokuwiki__pagetools ul li a:active {
+    padding: 5px 5px 5px 40px;
+}
+
+/* IE7 fixes, doesn't work without images */
+
+#IE7 #dokuwiki__pagetools ul li a {
+    background-image: url(images/pagetools-sprite.png);
+}
+
+#IE7 #dokuwiki__pagetools:hover ul li a span,
+#IE7 #dokuwiki__pagetools ul li a:focus span,
+#IE7 #dokuwiki__pagetools ul li a:active span {
+    clip: auto;
     display: inline;
     position: static;
 }
 
+#IE7 #dokuwiki__pagetools ul li a span {
+    clip: rect(0 0 0 0);
+    position: absolute;
+}
+
 #dokuwiki__pagetools ul li a:hover,
 #dokuwiki__pagetools ul li a:active,
 #dokuwiki__pagetools ul li a:focus {
@@ -139,6 +180,9 @@
     background-position: left -45px;
 }
 
+#dokuwiki__pagetools ul li a.create:before {
+    margin-top: -90px;
+}
 #dokuwiki__pagetools ul li a.create {
     background-position: right -90px;
 }
@@ -159,6 +203,9 @@
 #dokuwiki__pagetools ul li a.show {
     background-position: right -270px;
 }
+#dokuwiki__pagetools ul li a.show:before {
+    margin-top: -270px;
+}
 #dokuwiki__pagetools ul li a.show:hover,
 #dokuwiki__pagetools ul li a.show:active,
 #dokuwiki__pagetools ul li a.show:focus {
@@ -176,6 +223,9 @@
 #dokuwiki__pagetools ul li a.source {
     background-position: right -360px;
 }
+#dokuwiki__pagetools ul li a.source:before {
+    margin-top: -360px;
+}
 #dokuwiki__pagetools ul li a.source:hover,
 #dokuwiki__pagetools ul li a.source:active,
 #dokuwiki__pagetools ul li a.source:focus {
@@ -193,6 +243,9 @@
 #dokuwiki__pagetools ul li a.draft {
     background-position: right -180px;
 }
+#dokuwiki__pagetools ul li a.draft:before {
+    margin-top: -180px;
+}
 #dokuwiki__pagetools ul li a.draft:hover,
 #dokuwiki__pagetools ul li a.draft:active,
 #dokuwiki__pagetools ul li a.draft:focus {
@@ -210,44 +263,59 @@
 #dokuwiki__pagetools ul li a.revs {
     background-position: right -540px;
 }
+#dokuwiki__pagetools ul li a.revs:before {
+    margin-top: -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;
 }
+.mode_revisions #dokuwiki__pagetools ul li a.revs:before {
+    margin-top: -585px;
+}
 [dir=rtl] #dokuwiki__pagetools ul li a.revs {
     background-position: left -540px;
 }
 [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 {
+[dir=rtl] .mode_revisions #dokuwiki__pagetools ul li a.revs {
     background-position: left -585px;
 }
 
 #dokuwiki__pagetools ul li a.backlink {
     background-position: right -630px;
 }
+#dokuwiki__pagetools ul li a.backlink:before {
+    margin-top: -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;
 }
+.mode_backlink #dokuwiki__pagetools ul li a.backlink:before {
+    margin-top: -675px;
+}
 [dir=rtl] #dokuwiki__pagetools ul li a.backlink {
     background-position: left -630px;
 }
 [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 {
+[dir=rtl] .mode_backlink #dokuwiki__pagetools ul li a.backlink {
     background-position: left -675px;
 }
 
 #dokuwiki__pagetools ul li a.top {
     background-position: right -810px;
 }
+#dokuwiki__pagetools ul li a.top:before{
+    margin-top: -810px;
+}
 #dokuwiki__pagetools ul li a.top:hover,
 #dokuwiki__pagetools ul li a.top:active,
 #dokuwiki__pagetools ul li a.top:focus {
@@ -265,44 +333,59 @@
 #dokuwiki__pagetools ul li a.revert {
     background-position: right -450px;
 }
+#dokuwiki__pagetools ul li a.revert:before {
+    margin-top: -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;
 }
+.mode_revert #dokuwiki__pagetools ul li a.revert:before {
+    margin-top: -450px;
+}
 [dir=rtl] #dokuwiki__pagetools ul li a.revert {
     background-position: left -450px;
 }
 [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 {
+[dir=rtl] .mode_revert #dokuwiki__pagetools ul li a.revert {
     background-position: left -495px;
 }
 
 #dokuwiki__pagetools ul li a.subscribe {
     background-position: right -720px;
 }
+#dokuwiki__pagetools ul li a.subscribe:before {
+    margin-top: -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;
 }
+.mode_subscribe #dokuwiki__pagetools ul li a.subscribe:before {
+    margin-top: -765px;
+}
 [dir=rtl] #dokuwiki__pagetools ul li a.subscribe {
     background-position: left -720px;
 }
 [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 {
+[dir=rtl] .mode_subscribe #dokuwiki__pagetools ul li a.subscribe {
     background-position: left -765px;
 }
 
 #dokuwiki__pagetools ul li a.mediaManager {
     background-position: right -900px;
 }
+#dokuwiki__pagetools ul li a.mediaManager:before {
+    margin-top: -900px;
+}
 #dokuwiki__pagetools ul li a.mediaManager:hover,
 #dokuwiki__pagetools ul li a.mediaManager:active,
 #dokuwiki__pagetools ul li a.mediaManager:focus {
@@ -320,6 +403,9 @@
 #dokuwiki__pagetools ul li a.back {
     background-position: right -990px;
 }
+#dokuwiki__pagetools ul li a.back {
+    margin-top: -990px;
+}
 #dokuwiki__pagetools ul li a.back:hover,
 #dokuwiki__pagetools ul li a.back:active,
 #dokuwiki__pagetools ul li a.back:focus {
diff --git a/lib/tpl/dokuwiki/css/print.css b/lib/tpl/dokuwiki/css/print.css
index e0eaab848..86e686b69 100644
--- a/lib/tpl/dokuwiki/css/print.css
+++ b/lib/tpl/dokuwiki/css/print.css
@@ -106,7 +106,7 @@ blockquote {
     border: solid #ccc;
     border-width: 0 0 0 2pt;
 }
-[dir=rtl] .dokuwiki blockquote {
+[dir=rtl] blockquote {
     border-width: 0 2pt 0 0;
 }
 
diff --git a/lib/tpl/dokuwiki/detail.php b/lib/tpl/dokuwiki/detail.php
index a8c5fef8a..d2ed530a3 100644
--- a/lib/tpl/dokuwiki/detail.php
+++ b/lib/tpl/dokuwiki/detail.php
@@ -9,12 +9,12 @@
 
 // must be run from within DokuWiki
 if (!defined('DOKU_INC')) die();
+header('X-UA-Compatible: IE=edge,chrome=1');
 
 ?><!DOCTYPE html>
 <html lang="<?php echo $conf['lang']?>" dir="<?php echo $lang['direction'] ?>" class="no-js">
 <head>
     <meta charset="utf-8" />
-    <!--[if IE]><meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" /><![endif]-->
     <title>
         <?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 963750a1c..43a0c0da7 100644
--- a/lib/tpl/dokuwiki/main.php
+++ b/lib/tpl/dokuwiki/main.php
@@ -9,6 +9,7 @@
  */
 
 if (!defined('DOKU_INC')) die(); /* must be run from within DokuWiki */
+header('X-UA-Compatible: IE=edge,chrome=1');
 
 $hasSidebar = page_findnearest($conf['sidebar']);
 $showSidebar = $hasSidebar && ($ACT=='show');
@@ -16,7 +17,6 @@ $showSidebar = $hasSidebar && ($ACT=='show');
 <html lang="<?php echo $conf['lang'] ?>" dir="<?php echo $lang['direction'] ?>" class="no-js">
 <head>
     <meta charset="utf-8" />
-    <!--[if IE]><meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" /><![endif]-->
     <title><?php tpl_pagetitle() ?> [<?php echo strip_tags($conf['title']) ?>]</title>
     <script>(function(H){H.className=H.className.replace(/\bno-js\b/,'js')})(document.documentElement)</script>
     <?php tpl_metaheaders() ?>
diff --git a/lib/tpl/dokuwiki/mediamanager.php b/lib/tpl/dokuwiki/mediamanager.php
index 23c9cee79..dadf2b10f 100644
--- a/lib/tpl/dokuwiki/mediamanager.php
+++ b/lib/tpl/dokuwiki/mediamanager.php
@@ -7,12 +7,12 @@
  */
 // must be run from within DokuWiki
 if (!defined('DOKU_INC')) die();
+header('X-UA-Compatible: IE=edge,chrome=1');
 
 ?><!DOCTYPE html>
 <html lang="<?php echo $conf['lang']?>" dir="<?php echo $lang['direction'] ?>" class="popup no-js">
 <head>
     <meta charset="utf-8" />
-    <!--[if IE]><meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" /><![endif]-->
     <title>
         <?php echo hsc($lang['mediaselect'])?>
         [<?php echo strip_tags($conf['title'])?>]
diff --git a/lib/tpl/dokuwiki/template.info.txt b/lib/tpl/dokuwiki/template.info.txt
index d32e94d39..9d062655d 100644
--- a/lib/tpl/dokuwiki/template.info.txt
+++ b/lib/tpl/dokuwiki/template.info.txt
@@ -1,7 +1,7 @@
 base     dokuwiki
 author   Anika Henke
 email    anika@selfthinker.org
-date     2012-10-26
+date     2013-05-02
 name     DokuWiki Template
 desc     DokuWiki's default template since 2012
 url      http://www.dokuwiki.org/template:dokuwiki