💄 (editor) draft status is semantically not part of the toolbar

This change is useful for plugins that may want to implement their own toolbar (and thus hide the
default toolbar), but still would like to let the locktimer set the draft status.

2 files changed, 9 insertions, 8 deletions

diff --git a/inc/html.php b/inc/html.php
index 1f5033302..2e50f1443 100644
--- a/inc/html.php
+++ b/inc/html.php
@@ -1833,17 +1833,17 @@ function html_edit(){
     <div class="editBox" role="application">
 
     <div class="toolbar group">
-        <div id="draft__status" class="draft__status">
-            <?php
-                $draft = new \dokuwiki\Draft($ID, $INFO['client']);
-                if ($draft->isDraftAvailable()) {
-                    echo $draft->getDraftMessage();
-                }
-            ?>
-        </div>
         <div id="tool__bar" class="tool__bar"><?php if ($wr && $data['media_manager']){?><a href="<?php echo DOKU_BASE?>lib/exe/mediamanager.php?ns=<?php echo $INFO['namespace']?>"
             target="_blank"><?php echo $lang['mediaselect'] ?></a><?php }?></div>
     </div>
+    <div id="draft__status" class="draft__status">
+        <?php
+        $draft = new \dokuwiki\Draft($ID, $INFO['client']);
+        if ($draft->isDraftAvailable()) {
+            echo $draft->getDraftMessage();
+        }
+        ?>
+    </div>
     <?php
 
     html_form('edit', $form);
diff --git a/lib/tpl/dokuwiki/css/_edit.css b/lib/tpl/dokuwiki/css/_edit.css
index 526d49b99..30926bed1 100644
--- a/lib/tpl/dokuwiki/css/_edit.css
+++ b/lib/tpl/dokuwiki/css/_edit.css
@@ -12,6 +12,7 @@
 /*____________ toolbar ____________*/
 
 .dokuwiki div.toolbar {
+    display: inline-block;
     margin-bottom: .5em;
 }
 #draft__status {