mirror
/
OpenBuilds-CONTROL
kopia lustrzana https://github.com/OpenBuilds/OpenBuilds-CONTROL
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

Changed order of sub- abs on control tab

pull/110/head
openbuilds-engineer 2018-08-07 12:15:18 +02:00
rodzic 1193f10a12
commit 18f8f3a393
3 zmienionych plików z 20 dodań i 17 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

32
app/index.html
Wyświetl plik

@ -531,24 +531,11 @@
<div id="controlLogs"> <div id="controlLogs">
<ul class="tabs-expand-sm" data-role="tabs"> <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_1" id="serialconsoletab"><i class="fas fa-fw fa-terminal"></i>Serial Console</a></li>
<li><a href="#_target_2"><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> </ul>
<div id="_target_1"> <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 id="console"></div>
<div class="fixed-bottom m-3 mb-9"> <div class="fixed-bottom m-3 mb-9">
<form class="inline-form" id="commandform"> <form class="inline-form" id="commandform">
@ -563,6 +550,21 @@
</div> </div>
</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> </div>
<!-- End controlLogs --> <!-- End controlLogs -->
</center> </center>

3
app/js/websocket.js
Wyświetl plik

@ -98,7 +98,8 @@ function initSocket() {
socket.on('gcodeupload', function(data) { socket.on('gcodeupload', function(data) {
printLog("Received new GCODE from API") printLog("Received new GCODE from API")
editor.session.setValue(data); editor.session.setValue(data);
$('#controlTab').click() $('#gcodeeditortab').click()
// gcodeeditortab
}); });

2
package.json
Wyświetl plik

@ -1,6 +1,6 @@
{ {
"name": "OpenBuildsMachineDriver", "name": "OpenBuildsMachineDriver",
"version": "1.0.42", "version": "1.0.43",
"license": "AGPL-3.0", "license": "AGPL-3.0",
"description": "Machine Interface Driver for OpenBuilds", "description": "Machine Interface Driver for OpenBuilds",
"author": "github.com/openbuilds <webmaster@openbuilds.com>", "author": "github.com/openbuilds <webmaster@openbuilds.com>",