Merge branch 'master' of github.com:splitbrain/dokuwiki into frontend_improvements

Conflicts:
	lib/tpl/dokuwiki/css/basic.css

26 files changed, 105 insertions, 9 deletions

diff --git a/lib/tpl/dokuwiki/css/_links.css b/lib/tpl/dokuwiki/css/_links.css
index ef34a6706..c8f5b7c9e 100644
--- a/lib/tpl/dokuwiki/css/_links.css
+++ b/lib/tpl/dokuwiki/css/_links.css
@@ -43,16 +43,16 @@
 }
 /* external link */
 .dokuwiki a.urlextern {
-    background-image: url(images/link_icon.gif);
+    background-image: url(images/external-link.png);
     padding: 0 0 0 17px;
 }
 /* windows share */
 .dokuwiki a.windows {
-    background-image: url(images/windows.gif);
+    background-image: url(images/unc.png);
 }
 /* email link */
 .dokuwiki a.mail {
-    background-image: url(images/mail_icon.gif);
+    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/basic.css b/lib/tpl/dokuwiki/css/basic.css
index e7590dbb7..e0b8cddfe 100644
--- a/lib/tpl/dokuwiki/css/basic.css
+++ b/lib/tpl/dokuwiki/css/basic.css
@@ -17,7 +17,11 @@ body {
     color: __text__;
     background-color: __background_site__;
     background-image: url(images/page-background.svg);
-    /*background-image: linear-gradient( top, __background_neu__ 0%, __background_alt__ 1em, __background_site__ 4em);*/
+    /*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-size: 1px 10em;
     background-repeat: repeat-x;
     margin: 0;
@@ -195,6 +199,7 @@ img {
 img,
 object {
     max-width: 100%;
+    height: auto;
 }
 
 hr {
@@ -330,8 +335,12 @@ button,
 .qq-upload-button {
     color: #333;
     background-color: #eee;
-    background-image: url("data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIHZpZXdCb3g9IjAgMCAxIDEiIHByZXNlcnZlQXNwZWN0UmF0aW89Im5vbmUiPgo8bGluZWFyR3JhZGllbnQgaWQ9Imc4MjQiIGdyYWRpZW50VW5pdHM9InVzZXJTcGFjZU9uVXNlIiB4MT0iMCUiIHkxPSIwJSIgeDI9IjAlIiB5Mj0iMTAwJSI+CjxzdG9wIHN0b3AtY29sb3I9IiNGRkZGRkYiIG9mZnNldD0iMCIvPjxzdG9wIHN0b3AtY29sb3I9IiNGNEY0RjQiIG9mZnNldD0iMC4zIi8+PHN0b3Agc3RvcC1jb2xvcj0iI0VFRUVFRSIgb2Zmc2V0PSIwLjk5Ii8+PHN0b3Agc3RvcC1jb2xvcj0iI0NDQ0NDQyIgb2Zmc2V0PSIuOTkiLz4KPC9saW5lYXJHcmFkaWVudD4KPHJlY3QgeD0iMCIgeT0iMCIgd2lkdGg9IjEiIGhlaWdodD0iMSIgZmlsbD0idXJsKCNnODI0KSIgLz4KPC9zdmc+");
-    /*background: 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%);
+    background: linear-gradient(        top, #ffffff 0%, #f4f4f4 30%, #eeeeee 99%, #cccccc 99%);
     border: 1px solid #ccc;
     border-radius: 2px;
     padding: .1em .5em;
@@ -353,8 +362,12 @@ 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: linear-gradient( top, #ffffff 0%, #f4f4f4 30%, #dddddd 99%, #bbbbbb 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%, #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%);
 }
 
 input::-moz-focus-inner,
diff --git a/lib/tpl/dokuwiki/css/design.css b/lib/tpl/dokuwiki/css/design.css
index 1bc667fb5..059decf49 100644
--- a/lib/tpl/dokuwiki/css/design.css
+++ b/lib/tpl/dokuwiki/css/design.css
@@ -95,6 +95,17 @@
     text-overflow: ellipsis;
 }
 
+#dokuwiki__usertools a.action,
+#dokuwiki__sitetools a.action {
+    padding-left: 20px;
+    background: transparent url(images/sitetools.png) no-repeat 0 0;
+}
+[dir=rtl] #dokuwiki__usertools a.action,
+[dir=rtl] #dokuwiki__sitetools a.action {
+    padding-left: 0;
+    padding-right: 20px;
+}
+
 #dokuwiki__header .mobileTools {
     display: none; /* hide mobile tools dropdown to only show in mobile view */
 }
@@ -121,6 +132,37 @@
 #dokuwiki__usertools ul li.user {
 }
 
+#dokuwiki__usertools a.action.admin {
+    background-position: left -96px;
+}
+[dir=rtl] #dokuwiki__usertools a.action.admin {
+    background-position: right -96px;
+}
+#dokuwiki__usertools a.action.profile {
+    background-position: left -128px;
+}
+[dir=rtl] #dokuwiki__usertools a.action.profile {
+    background-position: right -128px;
+}
+#dokuwiki__usertools a.action.register {
+    background-position: left -160px;
+}
+[dir=rtl] #dokuwiki__usertools a.action.register {
+    background-position: right -160px;
+}
+#dokuwiki__usertools a.action.login {
+    background-position: left -192px;
+}
+[dir=rtl] #dokuwiki__usertools a.action.login {
+    background-position: right -192px;
+}
+#dokuwiki__usertools a.action.logout {
+    background-position: left -224px;
+}
+[dir=rtl] #dokuwiki__usertools a.action.logout {
+    background-position: right -224px;
+}
+
 
 /*____________ site tools ____________*/
 
@@ -165,6 +207,25 @@
 #dokuwiki__sitetools li {
 }
 
+#dokuwiki__sitetools a.action.recent {
+    background-position: left 0;
+}
+[dir=rtl] #dokuwiki__sitetools a.action.recent {
+    background-position: right 0;
+}
+#dokuwiki__sitetools a.action.media {
+    background-position: left -32px;
+}
+[dir=rtl] #dokuwiki__sitetools a.action.media {
+    background-position: right -32px;
+}
+#dokuwiki__sitetools a.action.index {
+    background-position: left -64px;
+}
+[dir=rtl] #dokuwiki__sitetools a.action.index {
+    background-position: right -64px;
+}
+
 /*____________ breadcrumbs ____________*/
 
 .dokuwiki div.breadcrumbs {
diff --git a/lib/tpl/dokuwiki/css/pagetools.css b/lib/tpl/dokuwiki/css/pagetools.css
index f691d82a7..a40d525b3 100644
--- a/lib/tpl/dokuwiki/css/pagetools.css
+++ b/lib/tpl/dokuwiki/css/pagetools.css
@@ -14,7 +14,9 @@
     padding-left: 40px;
 }
 .dokuwiki div.page {
+    height: 190px;
     min-height: 190px; /* 30 (= height of icons) x 6 (= maximum number of possible tools) + 2x5 */
+    height: auto;
 }
 #dokuwiki__usertools {
     /* move the tools just outside of the site */
@@ -31,6 +33,7 @@
     right: -40px;
     /* on same vertical level as first headline, because .page has 2em padding */
     top: 2em;
+    width: 40px;
 }
 [dir=rtl] #dokuwiki__pagetools {
     right: auto;
@@ -39,6 +42,7 @@
 
 #dokuwiki__pagetools div.tools {
     position: fixed;
+    width: 40px;
 }
 
 #dokuwiki__pagetools ul {
@@ -83,7 +87,8 @@
 /* hide labels accessibly when neither on hover nor on focus */
 #dokuwiki__pagetools ul li a span {
     position: absolute;
-    left: -99999px;
+    clip: rect(0 0 0 0); /* IE7, IE6 */
+    clip: rect(0, 0, 0, 0);
 }
 
 /* show all tools on hover and individual tools on focus */
diff --git a/lib/tpl/dokuwiki/css/print.css b/lib/tpl/dokuwiki/css/print.css
index 9f43f5131..191d50c28 100644
--- a/lib/tpl/dokuwiki/css/print.css
+++ b/lib/tpl/dokuwiki/css/print.css
@@ -138,6 +138,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 {
@@ -154,6 +157,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;
 }
@@ -174,6 +181,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;
diff --git a/lib/tpl/dokuwiki/images/apple-touch-icon.png b/lib/tpl/dokuwiki/images/apple-touch-icon.png
index 45fa4e7b0..fb5f108c0 100644
--- a/lib/tpl/dokuwiki/images/apple-touch-icon.png
+++ b/lib/tpl/dokuwiki/images/apple-touch-icon.png
diff --git a/lib/tpl/dokuwiki/images/bullet.png b/lib/tpl/dokuwiki/images/bullet.png
index 5da537443..5e557b334 100644
--- a/lib/tpl/dokuwiki/images/bullet.png
+++ b/lib/tpl/dokuwiki/images/bullet.png
diff --git a/lib/tpl/dokuwiki/images/button-dw.png b/lib/tpl/dokuwiki/images/button-dw.png
index 97272d968..8d6aea898 100644
--- a/lib/tpl/dokuwiki/images/button-dw.png
+++ b/lib/tpl/dokuwiki/images/button-dw.png
diff --git a/lib/tpl/dokuwiki/images/button-rss.png b/lib/tpl/dokuwiki/images/button-rss.png
index f2438043f..b7cddadec 100644
--- a/lib/tpl/dokuwiki/images/button-rss.png
+++ b/lib/tpl/dokuwiki/images/button-rss.png
diff --git a/lib/tpl/dokuwiki/images/closed-rtl.png b/lib/tpl/dokuwiki/images/closed-rtl.png
index 85ebd59e1..caa027e34 100644
--- a/lib/tpl/dokuwiki/images/closed-rtl.png
+++ b/lib/tpl/dokuwiki/images/closed-rtl.png
diff --git a/lib/tpl/dokuwiki/images/closed.png b/lib/tpl/dokuwiki/images/closed.png
index 3691ebc17..e3bd0f9e9 100644
--- a/lib/tpl/dokuwiki/images/closed.png
+++ b/lib/tpl/dokuwiki/images/closed.png
diff --git a/lib/tpl/dokuwiki/images/email.png b/lib/tpl/dokuwiki/images/email.png
new file mode 100644
index 000000000..5128be895
--- /dev/null
+++ b/lib/tpl/dokuwiki/images/email.png
diff --git a/lib/tpl/dokuwiki/images/external-link.png b/lib/tpl/dokuwiki/images/external-link.png
new file mode 100644
index 000000000..084135f95
--- /dev/null
+++ b/lib/tpl/dokuwiki/images/external-link.png
diff --git a/lib/tpl/dokuwiki/images/icons-license.txt b/lib/tpl/dokuwiki/images/icons-license.txt
new file mode 100644
index 000000000..7e12bbbd4
--- /dev/null
+++ b/lib/tpl/dokuwiki/images/icons-license.txt
@@ -0,0 +1,5 @@
+Icons for:  sitetools.png, email.png, external-link.png and unc.png
+Icon set:   Dusseldorf
+Designer:   pc.de
+License:    Creative Commons Attribution License [http://creativecommons.org/licenses/by/3.0/]
+URL:        http://pc.de/icons/#Dusseldorf
diff --git a/lib/tpl/dokuwiki/images/link_icon.gif b/lib/tpl/dokuwiki/images/link_icon.gif
deleted file mode 100644
index 815ccb1b1..000000000
--- a/lib/tpl/dokuwiki/images/link_icon.gif
+++ /dev/null
diff --git a/lib/tpl/dokuwiki/images/logo.png b/lib/tpl/dokuwiki/images/logo.png
index 8b794dd64..35640279c 100644
--- a/lib/tpl/dokuwiki/images/logo.png
+++ b/lib/tpl/dokuwiki/images/logo.png
diff --git a/lib/tpl/dokuwiki/images/mail_icon.gif b/lib/tpl/dokuwiki/images/mail_icon.gif
deleted file mode 100644
index 50a87a9a0..000000000
--- a/lib/tpl/dokuwiki/images/mail_icon.gif
+++ /dev/null
diff --git a/lib/tpl/dokuwiki/images/open.png b/lib/tpl/dokuwiki/images/open.png
index 40ff129be..5f2d408c5 100644
--- a/lib/tpl/dokuwiki/images/open.png
+++ b/lib/tpl/dokuwiki/images/open.png
diff --git a/lib/tpl/dokuwiki/images/pagetools-sprite.png b/lib/tpl/dokuwiki/images/pagetools-sprite.png
index bbd7fd361..898f0f4a6 100644
--- a/lib/tpl/dokuwiki/images/pagetools-sprite.png
+++ b/lib/tpl/dokuwiki/images/pagetools-sprite.png
diff --git a/lib/tpl/dokuwiki/images/resizecol.png b/lib/tpl/dokuwiki/images/resizecol.png
index f0111507c..b5aeec004 100644
--- a/lib/tpl/dokuwiki/images/resizecol.png
+++ b/lib/tpl/dokuwiki/images/resizecol.png
diff --git a/lib/tpl/dokuwiki/images/search.png b/lib/tpl/dokuwiki/images/search.png
index 2adfc7357..1ab7866fb 100644
--- a/lib/tpl/dokuwiki/images/search.png
+++ b/lib/tpl/dokuwiki/images/search.png
diff --git a/lib/tpl/dokuwiki/images/sitetools.png b/lib/tpl/dokuwiki/images/sitetools.png
new file mode 100644
index 000000000..dc5764647
--- /dev/null
+++ b/lib/tpl/dokuwiki/images/sitetools.png
diff --git a/lib/tpl/dokuwiki/images/toc-arrows.png b/lib/tpl/dokuwiki/images/toc-arrows.png
index 9f441eb26..4a353e4f6 100644
--- a/lib/tpl/dokuwiki/images/toc-arrows.png
+++ b/lib/tpl/dokuwiki/images/toc-arrows.png
diff --git a/lib/tpl/dokuwiki/images/toc-bullet.png b/lib/tpl/dokuwiki/images/toc-bullet.png
index a6f0169c3..fc771b97e 100644
--- a/lib/tpl/dokuwiki/images/toc-bullet.png
+++ b/lib/tpl/dokuwiki/images/toc-bullet.png
diff --git a/lib/tpl/dokuwiki/images/unc.png b/lib/tpl/dokuwiki/images/unc.png
new file mode 100644
index 000000000..f2aca8815
--- /dev/null
+++ b/lib/tpl/dokuwiki/images/unc.png
diff --git a/lib/tpl/dokuwiki/images/windows.gif b/lib/tpl/dokuwiki/images/windows.gif
deleted file mode 100644
index 4f12acce1..000000000
--- a/lib/tpl/dokuwiki/images/windows.gif
+++ /dev/null