Move the help button

Fix the Publish "sending" button state and margin

app/widgets/Publish/Publish.php

@@ -109,6 +109,8 @@ class Publish extends Base
 
     public function ajaxPublish($id)
     {
+        $this->rpc('Publish.disableSend');
+
         $draft = $this->user->drafts()->find($id);
 
         if ($draft && !$draft->empty()) {
@@ -240,7 +242,7 @@ class Publish extends Base
             $p->request();
             $draft->delete();
         } else {
-            $this->rpc('publish.enableSend');
+            $this->rpc('Publish.enableSend');
             Toast::send($this->__('publish.no_title'));
         }
     }

app/widgets/Publish/publish.css

@@ -28,6 +28,10 @@
     height: 3.5rem;
 }
 
+#publish .button.send {
+    margin-left: 2rem;
+}
+
 #publish span.privacy form > div .checkbox > input[type="checkbox"] + label {
     top: 0;
     height: 3.5rem;

app/widgets/Publish/publish.js

@@ -26,15 +26,15 @@ var Publish = {
     },
 
     enableSend: function() {
-        document.querySelector('#button_send').classList.remove('disabled');
-        document.querySelector('#button_send i').classList.remove('spin');
-        document.querySelector('#button_send i').innerText = 'send';
+        document.querySelector('.button.send').classList.remove('disabled');
+        document.querySelector('.button.send i').classList.remove('spin');
+        document.querySelector('.button.send i').innerText = 'send';
     },
 
     disableSend: function() {
-        document.querySelector('#button_send').classList.add('disabled');
-        document.querySelector('#button_send i').classList.add('spin');
-        document.querySelector('#button_send i').innerText = 'autorenew';
+        document.querySelector('.button.send').classList.add('disabled');
+        document.querySelector('.button.send i').classList.add('spin');
+        document.querySelector('.button.send i').innerText = 'autorenew';
     },
 
     preview: function() {

app/widgets/Publish/publish.tpl

@@ -2,9 +2,6 @@
     <header>
         <ul class="list thick">
             <li>
-                <span class="control icon gray active on_mobile" onclick="PublishHelp_ajaxDrawer()">
-                    <i class="material-icons">help</i>
-                </span>
                 <span class="control privacy"
                 title="{$c->__('post.public')}">
                     <form>
@@ -156,19 +153,16 @@
                         </a>
                     {/if}
 
-                    <button class="button oppose color on_desktop" onclick="Publish.publish()">
-                        <i class="material-icons">send</i>
-                        {$c->__('page.publish')}
-                    </button>
-                    <button class="button oppose color on_mobile" onclick="Publish.publish()">
+                    <button class="button send oppose color" onclick="Publish.publish()">
                         <i class="material-icons">send</i>
+                        <span class="on_desktop">{$c->__('page.publish')}</span>
                     </button>
-                    <button class="button flat oppose gray on_desktop" onclick="Publish.preview()">
+                    <button class="button flat oppose gray" onclick="Publish.preview()">
                         <i class="material-icons">visibility</i>
-                        {$c->__('publish.preview')}
+                        <span class="on_desktop">{$c->__('publish.preview')}</span>
                     </button>
-                    <button class="button flat oppose gray on_mobile" onclick="Publish.preview()">
-                        <i class="material-icons">visibility</i>
+                    <button class="button flat oppose gray on_mobile" onclick="PublishHelp_ajaxDrawer()">
+                        <i class="material-icons">help</i>
                     </button>
                 </div>
             </li>