Merge branch 'master' into stable

Conflicts:
	data/deleted.files
	doku.php
	lib/exe/xmlrpc.php

4 files changed, 152 insertions, 113 deletions

diff --git a/lib/styles/all.css b/lib/styles/all.css
new file mode 100644
index 000000000..dd9f46462
--- /dev/null
+++ b/lib/styles/all.css
@@ -0,0 +1,48 @@
+/**
+ * Basic styles. These styles are needed for basic DokuWiki functions
+ * regardless of the used template. Templates can override them of course
+ */
+
+div.clearer {
+    clear: both;
+    line-height: 0;
+    height: 0;
+    overflow: hidden;
+}
+
+div.no {
+    display: inline;
+    margin: 0;
+    padding: 0;
+}
+
+.hidden {
+    display: none;
+}
+
+/* image alignment */
+.medialeft {
+    float: left;
+}
+.mediaright {
+    float: right;
+}
+.mediacenter {
+    display: block;
+    margin-left: auto;
+    margin-right: auto;
+}
+
+/* table cell alignment */
+.leftalign   { text-align: left;   }
+.centeralign { text-align: center; }
+.rightalign  { text-align: right;  }
+
+/* underline */
+em.u {
+    font-style: normal;
+    text-decoration: underline;
+}
+em em.u {
+    font-style: italic;
+}
diff --git a/lib/styles/print.css b/lib/styles/print.css
new file mode 100644
index 000000000..16543473a
--- /dev/null
+++ b/lib/styles/print.css
@@ -0,0 +1,24 @@
+/**
+ * Basic styles. These styles are needed for basic DokuWiki functions
+ * regardless of the used template. Templates can override them of course
+ */
+
+/* messages with msg() */
+div.error,
+div.info,
+div.success,
+div.notify {
+    display: none;
+}
+
+/* section edit button */
+.secedit {
+    display: none;
+}
+
+/* modal windows */
+.JSpopup,
+#link__wiz,
+#media__popup {
+    display: none;
+}
diff --git a/lib/styles/screen.css b/lib/styles/screen.css
new file mode 100644
index 000000000..0a6a4f295
--- /dev/null
+++ b/lib/styles/screen.css
@@ -0,0 +1,80 @@
+/**
+ * Basic styles. These styles are needed for basic DokuWiki functions
+ * regardless of the used template. Templates can override them of course
+ */
+
+/* messages with msg() */
+div.error,
+div.info,
+div.success,
+div.notify {
+    color: #000;
+    background-repeat: no-repeat;
+    background-position: .5em 0;
+    border-bottom: 1px solid;
+    font-size: 90%;
+    margin: 0;
+    padding-left: 3em;
+    overflow: hidden;
+}
+
+div.error {
+    background-color: #fcc;
+    background-image: url(../images/error.png);
+    border-bottom-color: #faa;
+}
+
+div.info {
+    background-color: #ccf;
+    background-image: url(../images/info.png);
+    border-bottom-color: #aaf;
+}
+
+div.success {
+    background-color: #cfc;
+    background-image: url(../images/success.png);
+    border-bottom-color: #afa;
+}
+
+div.notify {
+    background-color: #ffc;
+    background-image: url(../images/notify.png);
+    border-bottom-color: #ffa;
+}
+
+/* modal windows */
+.JSpopup,
+#link__wiz,
+#media__popup {
+    position: absolute;
+    background-color: #fff;
+    color: #000;
+    z-index: 20;
+    overflow: hidden;
+}
+
+
+/* syntax highlighting code */
+.code .br0  { color: #66cc66; }
+.code .co0  { color: #808080; font-style: italic; }
+.code .co1  { color: #808080; font-style: italic; }
+.code .co2  { color: #808080; font-style: italic; }
+.code .co3  { color: #808080; }
+.code .coMULTI  { color: #808080; font-style: italic; }
+.code .es0  { color: #000099; font-weight: bold; }
+.code .kw1  { color: #b1b100; }
+.code .kw2  { color: #000000; font-weight: bold; }
+.code .kw3  { color: #000066; }
+.code .kw4  { color: #993333; }
+.code .kw5  { color: #0000ff; }
+.code .me1  { color: #006600; }
+.code .me2  { color: #006600; }
+.code .nu0  { color: #cc66cc; }
+.code .re0  { color: #0000ff; }
+.code .re1  { color: #0000ff; }
+.code .re2  { color: #0000ff; }
+.code .re3  { color: #ff3333; font-weight:bold; }
+.code .re4  { color: #009999; }
+.code .st0  { color: #ff0000; }
+.code .sy0  { color: #66cc66; }
+
diff --git a/lib/styles/style.css b/lib/styles/style.css
deleted file mode 100644
index 814191615..000000000
--- a/lib/styles/style.css
+++ /dev/null
@@ -1,113 +0,0 @@
-/**
- * Basic styles. These styles are needed for basic DokuWiki functions
- * regardless of the used template. Templates can override them of course
- */
-
-div.clearer {
-  clear: both;
-  line-height: 0;
-  height: 0;
-  overflow: hidden;
-}
-
-div.no {
-  display: inline;
-  margin: 0;
-  padding: 0;
-}
-
-.hidden {
-  display: none;
-}
-
-div.error {
-  background: #fcc url(../images/error.png) 0.5em 0px no-repeat;
-  color: #000;
-  border-bottom: 1px solid #faa;
-  font-size: 90%;
-  margin: 0;
-  padding-left: 3em;
-  overflow: hidden;
-}
-
-div.info {
-  background: #ccf url(../images/info.png) 0.5em 0px no-repeat;
-  color: #000;
-  border-bottom: 1px solid #aaf;
-  font-size: 90%;
-  margin: 0;
-  padding-left: 3em;
-  overflow: hidden;
-}
-
-div.success {
-  background: #cfc url(../images/success.png) 0.5em 0px no-repeat;
-  color: #000;
-  border-bottom: 1px solid #afa;
-  font-size: 90%;
-  margin: 0;
-  padding-left: 3em;
-  overflow: hidden;
-}
-
-div.notify {
-  background: #ffc url(../images/notify.png) 0.5em 0px no-repeat;
-  color: #000;
-  border-bottom: 1px solid #ffa;
-  font-size: 90%;
-  margin: 0;
-  padding-left: 3em;
-  overflow: hidden;
-}
-
-
-/* image alignment */
-.medialeft {
-  float: left;
-}
-.mediaright {
-  float: right;
-}
-.mediacenter {
-  display: block;
-  margin-left: auto;
-  margin-right: auto;
-}
-
-.leftalign { text-align: left; }
-.centeralign { text-align: center; }
-.rightalign { text-align: right; }
-
-em.u {
-  font-style: normal;
-  text-decoration: underline;
-}
-em em.u {
-  font-style: italic;
-}
-
-
-/* syntax highlighting code */
-.code .br0  { color: #66cc66; }
-.code .co0  { color: #808080; font-style: italic; }
-.code .co1  { color: #808080; font-style: italic; }
-.code .co2  { color: #808080; font-style: italic; }
-.code .co3  { color: #808080; }
-.code .coMULTI  { color: #808080; font-style: italic; }
-.code .es0  { color: #000099; font-weight: bold; }
-.code .kw1  { color: #b1b100; }
-.code .kw2  { color: #000000; font-weight: bold; }
-.code .kw3  { color: #000066; }
-.code .kw4  { color: #993333; }
-.code .kw5  { color: #0000ff; }
-.code .me1  { color: #006600; }
-.code .me2  { color: #006600; }
-.code .nu0  { color: #cc66cc; }
-.code .re0  { color: #0000ff; }
-.code .re1  { color: #0000ff; }
-.code .re2  { color: #0000ff; }
-.code .re3  { color: #ff3333; font-weight:bold; }
-.code .re4  { color: #009999; }
-.code .st0  { color: #ff0000; }
-.code .sy0  { color: #66cc66; }
-