Merge branch 'master' into stable

Conflicts:
	conf/msg
	lib/plugins/acl/ajax.php

7 files changed, 149 insertions, 11 deletions

diff --git a/lib/tpl/default/_mediaoptions.css b/lib/tpl/default/_mediaoptions.css
new file mode 100644
index 000000000..7ac489929
--- /dev/null
+++ b/lib/tpl/default/_mediaoptions.css
@@ -0,0 +1,92 @@
+/* --- popup --- */
+
+#media__popup {
+    background-color:__background__;
+    display:none;
+    border: 1px solid __border__;
+    position: absolute;
+    width:270px;
+}
+
+#media__popup h1 {
+    text-align:center;
+    font-weight:normal;
+    background-color: __background_alt__;
+    height: 16px;
+    margin-bottom: 5px;
+    font-size:12px;
+    border-bottom: 0;
+}
+
+#media__popup p {
+    display:block;
+    line-height:14pt;
+    margin:0.5em;
+}
+
+#media_nolink {
+    padding:4px 0;
+}
+
+#media__popup label {
+    float:left;
+    width:9em;
+}
+
+#media__popup .button {
+    margin-left:auto;
+    margin-right:auto;
+}
+
+#media__popup .btnlbl {
+    text-align:center;
+}
+
+#media__popup .btnlbl input {
+    margin:0 1em;
+}
+
+#media__closeimg {
+    float:right;
+}
+
+/* --- display options --- */
+
+#media__linkopts label,
+#media__nolnk {
+	width: 80px;
+	float: left;
+	margin-left: 10px;
+}
+
+#media__linkopts label{
+	line-height: 20px;
+}
+
+#media__nolnk,
+#media__linkopts label.long{
+	margin-bottom: 8px;
+	line-height: 12px;
+}
+
+#media__linkopts label.long{
+	width: 150px;
+	float: none;
+}
+
+#media__linkopts br {
+	clear: both;
+}
+
+#media__linkopts select {
+	width: 60px;
+	margin-left: 10px;
+}
+
+#media__linkopts input.edit {
+    width:50px;
+    margin-left:10px;
+}
+#media__linkopts #media__title {
+    width:150px;
+}
diff --git a/lib/tpl/default/_subscription.css b/lib/tpl/default/_subscription.css
new file mode 100644
index 000000000..0792c8c21
--- /dev/null
+++ b/lib/tpl/default/_subscription.css
@@ -0,0 +1,21 @@
+/**
+ * Styles for the subscription page
+ */
+
+form#subscribe__form {
+    display: block;
+    width: 300px;
+    text-align: center;
+}
+
+form#subscribe__form fieldset {
+    text-align: left;
+    margin: 0.5em 0;
+}
+
+form#subscribe__form label {
+    display:block;
+    margin: 0 0.5em 0.5em;
+}
+
+
diff --git a/lib/tpl/default/design.css b/lib/tpl/default/design.css
index 4830a9e2c..09a9ecf01 100644
--- a/lib/tpl/default/design.css
+++ b/lib/tpl/default/design.css
@@ -91,7 +91,10 @@ div.dokuwiki textarea.edit {
   background-color: __background__;
   border: 1px solid __border__;
   padding: 0.3em 0 0 0.3em;
-  width: 100%;
+  /* should just be "width: 100%", but IE8 doesn't like it, see FS#1910 + FS#1667 */
+  width: 700px;
+  min-width: 100%;
+  max-width: 100%;
 }
 
 /* nice alphatransparency background except for IE <7 */
@@ -462,6 +465,7 @@ div.dokuwiki blockquote {
 }
 
 div.dokuwiki pre {
+  font-family: monospace;
   font-size: 120%;
   padding: 0.5em;
   border: 1px dashed __border__;
@@ -688,6 +692,7 @@ div.insitu-footnote {
   text-align: left;
   padding: 4px;
   max-width: 40%;    /* IE's width is handled in javascript */
+  min-width: 5em;
 }
 
 /* overcome IE issue with one line code or file boxes which require h. scrolling */
@@ -741,8 +746,8 @@ div.dokuwiki ul.search_quickhits li {
   width: 30%;
 }
 
-div.dokuwiki div.section_highlight {
-  background-color: __background_alt__;
+div.dokuwiki .section_highlight {
+  background-color: __background_alt__ !important;
 }
 
 /* ------------------ Additional ---------------------- */
@@ -833,3 +838,4 @@ div.dokuwiki div.imagemeta img.thumb {
   float: left;
   margin-right: 0.1em;
 }
+
diff --git a/lib/tpl/default/main.php b/lib/tpl/default/main.php
index 67c3a00ba..d9231678b 100644
--- a/lib/tpl/default/main.php
+++ b/lib/tpl/default/main.php
@@ -82,7 +82,7 @@ if (!defined('DOKU_INC')) die();
     <?php }?>
 
   </div>
-  <?php flush()?>
+  <?php tpl_flush()?>
 
   <?php /*old includehook*/ @include(dirname(__FILE__).'/pageheader.html')?>
 
@@ -94,7 +94,7 @@ if (!defined('DOKU_INC')) die();
 
   <div class="clearer">&nbsp;</div>
 
-  <?php flush()?>
+  <?php tpl_flush()?>
 
   <div class="stylefoot">
 
@@ -117,7 +117,6 @@ if (!defined('DOKU_INC')) die();
       </div>
       <div class="bar-right" id="bar__bottomright">
         <?php tpl_button('subscribe')?>
-        <?php tpl_button('subscribens')?>
         <?php tpl_button('admin')?>
         <?php tpl_button('profile')?>
         <?php tpl_button('login')?>
diff --git a/lib/tpl/default/print.css b/lib/tpl/default/print.css
index 1d6e0756f..60c172585 100644
--- a/lib/tpl/default/print.css
+++ b/lib/tpl/default/print.css
@@ -21,6 +21,10 @@ a {
   background: none !important;
 }
 
+a.interwiki {
+  padding-left: 0px !important;
+}
+
 
 div.meta {
   clear: both;
@@ -143,6 +147,10 @@ span.li {
     font-weight: normal;
 }
 
+pre {
+  font-family: monospace;
+}
+
 /* code blocks by indention */
 pre.pre {
   font-size: 8pt;
diff --git a/lib/tpl/default/rtl.css b/lib/tpl/default/rtl.css
index af3793f7d..b59fcc783 100644
--- a/lib/tpl/default/rtl.css
+++ b/lib/tpl/default/rtl.css
@@ -45,6 +45,10 @@ div.meta div.doc {
 
 div.dokuwiki ul,
 div.dokuwiki ol {
+  margin: 0.5em 3.5em 0.5em 0;
+}
+div.dokuwiki li ul,
+div.dokuwiki li ol {
   margin: 0.5em 1.5em 0.5em 0;
 }
 
@@ -113,7 +117,13 @@ div.dokuwiki ul.toc li.clear {
   padding-right: 0.4em;
 }
 
-div.dokuwiki pre {
+div.dokuwiki .code {
+  direction: ltr;
   text-align: left;
 }
-
+div.dokuwiki blockquote {
+  border-left: 0;
+  padding-left: 0;
+  border-right: 2px solid  __border__;
+  padding-right: 3px;
+}
diff --git a/lib/tpl/default/style.ini b/lib/tpl/default/style.ini
index dfd5500fa..c5b2c31a5 100644
--- a/lib/tpl/default/style.ini
+++ b/lib/tpl/default/style.ini
@@ -10,9 +10,11 @@ layout.css     = screen
 design.css     = screen
 style.css      = screen
 
-media.css      = screen
-_admin.css     = screen
-_linkwiz.css   = screen
+media.css         = screen
+_mediaoptions.css = screen
+_admin.css        = screen
+_linkwiz.css      = screen
+_subscription.css = screen
 
 rtl.css        = rtl
 print.css      = print