From 18f8f3a393cc4f2e0b6677af5764277264c67d4e Mon Sep 17 00:00:00 2001
From: openbuilds-engineer <p.walt@openbuilds.com>
Date: Tue, 7 Aug 2018 12:15:18 +0200
Subject: [PATCH] Changed order of sub- abs on control tab

---
 app/index.html      | 32 +++++++++++++++++---------------
 app/js/websocket.js |  3 ++-
 package.json        |  2 +-
 3 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/app/index.html b/app/index.html
index 0f9de50..2da1bde 100644
--- a/app/index.html
+++ b/app/index.html
@@ -531,24 +531,11 @@
 
           <div id="controlLogs">
             <ul class="tabs-expand-sm" data-role="tabs">
-              <li><a href="#_target_1"><i class="far fa-fw fa-edit"></i>GCODE Editor</a></li>
-              <li><a href="#_target_2"><i class="fas fa-fw fa-terminal"></i>Serial Console</a></li>
+              <li><a href="#_target_1" id="serialconsoletab"><i class="fas fa-fw fa-terminal"></i>Serial Console</a></li>
+              <li><a href="#_target_2" id="gcodeeditortab"><i class="far fa-fw fa-edit"></i>GCODE Editor</a></li>
             </ul>
 
             <div id="_target_1">
-              <div id="editor"></div>
-              <div class="fixed-bottom m-3 mb-9">
-                <button data-toggle="tooltip" data-placement="bottom" title="Find and Replace" class="button dark" onclick="editor.execCommand('replace')"><i class="fas fa-search"></i></button>
-                <button data-toggle="tooltip" data-placement="bottom" title="Select All" class="button dark" onclick="editor.execCommand('selectall')"><i class="far fa-check-square"></i></button>
-                <button data-toggle="tooltip" data-placement="bottom" title="Undo" class="button dark" onclick="editor.execCommand('undo')"><i class="fas fa-undo"></i></button>
-                <button data-toggle="tooltip" data-placement="bottom" title="Redo" class="button dark" onclick="editor.execCommand('redo')"><i class="fas fa-redo"></i></button>
-                <button data-toggle="tooltip" data-placement="bottom" title="Go to End" class="button dark" onclick="editor.execCommand('gotoend')"><i class="fas fa-chevron-down"></i></button>
-                <button data-toggle="tooltip" data-placement="bottom" title="Go to Start" class="button dark" onclick="editor.execCommand('gotostart')"><i class="fas fa-chevron-up"></i></button>
-                <button data-toggle="tooltip" data-placement="bottom" title="Clear Editor" class="button dark" onclick="editor.execCommand('selectall'); editor.execCommand('del');"><i class="fas fa-eraser"></i></button>
-                <!-- <button data-toggle="tooltip" data-placement="bottom" title="Editor Settings" class="btn btn-xs btn-success btn-file" onclick="editor.execCommand('showSettingsMenu')"><i class="fa fa-cogs fa-fw"></i></span></button> -->
-              </div>
-            </div>
-            <div id="_target_2">
               <div id="console"></div>
               <div class="fixed-bottom m-3 mb-9">
                 <form class="inline-form" id="commandform">
@@ -563,6 +550,21 @@
               </div>
             </div>
 
+            <div id="_target_2">
+              <div id="editor"></div>
+              <div class="fixed-bottom m-3 mb-9">
+                <button data-toggle="tooltip" data-placement="bottom" title="Find and Replace" class="button dark" onclick="editor.execCommand('replace')"><i class="fas fa-search"></i></button>
+                <button data-toggle="tooltip" data-placement="bottom" title="Select All" class="button dark" onclick="editor.execCommand('selectall')"><i class="far fa-check-square"></i></button>
+                <button data-toggle="tooltip" data-placement="bottom" title="Undo" class="button dark" onclick="editor.execCommand('undo')"><i class="fas fa-undo"></i></button>
+                <button data-toggle="tooltip" data-placement="bottom" title="Redo" class="button dark" onclick="editor.execCommand('redo')"><i class="fas fa-redo"></i></button>
+                <button data-toggle="tooltip" data-placement="bottom" title="Go to End" class="button dark" onclick="editor.execCommand('gotoend')"><i class="fas fa-chevron-down"></i></button>
+                <button data-toggle="tooltip" data-placement="bottom" title="Go to Start" class="button dark" onclick="editor.execCommand('gotostart')"><i class="fas fa-chevron-up"></i></button>
+                <button data-toggle="tooltip" data-placement="bottom" title="Clear Editor" class="button dark" onclick="editor.execCommand('selectall'); editor.execCommand('del');"><i class="fas fa-eraser"></i></button>
+                <!-- <button data-toggle="tooltip" data-placement="bottom" title="Editor Settings" class="btn btn-xs btn-success btn-file" onclick="editor.execCommand('showSettingsMenu')"><i class="fa fa-cogs fa-fw"></i></span></button> -->
+              </div>
+            </div>
+
+
           </div>
           <!-- End controlLogs -->
         </center>
diff --git a/app/js/websocket.js b/app/js/websocket.js
index c410e60..b2132c4 100644
--- a/app/js/websocket.js
+++ b/app/js/websocket.js
@@ -98,7 +98,8 @@ function initSocket() {
   socket.on('gcodeupload', function(data) {
     printLog("Received new GCODE from API")
     editor.session.setValue(data);
-    $('#controlTab').click()
+    $('#gcodeeditortab').click()
+    // gcodeeditortab
   });
 
 
diff --git a/package.json b/package.json
index 26dd0ec..5c0d6c6 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "OpenBuildsMachineDriver",
-  "version": "1.0.42",
+  "version": "1.0.43",
   "license": "AGPL-3.0",
   "description": "Machine Interface Driver for OpenBuilds",
   "author": "github.com/openbuilds <webmaster@openbuilds.com>",