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

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

21 files changed, 5 insertions, 0 deletions

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