From 47a35374904c2ae4038d1075af4f477bbec437b0 Mon Sep 17 00:00:00 2001
From: ntoff <norahtihtzoff@gmail.com>
Date: Sat, 18 Nov 2017 07:21:29 +1000
Subject: [PATCH] move input box under touchUI + fix non functional button

move the input box over underneath the feedrate / flowrate to keep them all in the same spot and fix the stupid button not working in firefox (NFI why it didn't work, the code is literally the same it's just in a new spot. GG)
---
 octoprint_fanspeedslider/static/js/fanslider.js | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/octoprint_fanspeedslider/static/js/fanslider.js b/octoprint_fanspeedslider/static/js/fanslider.js
index 878cf68..362dc63 100644
--- a/octoprint_fanspeedslider/static/js/fanslider.js
+++ b/octoprint_fanspeedslider/static/js/fanslider.js
@@ -88,14 +88,10 @@ $(function () {
 					<button class=\"btn btn-block control-box\" id=\"fan-on\" data-bind=\"enable: isOperational() && loginState.isUser(), click: function() { $root.sendFanSpeed() }\">" + gettext("Fan on") + "</button>\
 				");
 				//also add spin box + button below in its own section, button is redundant but convenient
-				$("#control-jog-extrusion").after("\
-				<div id=\"control-fan-slider\" class=\"jog-panel filament\" data-bind=\"visible: loginState.isUser\">\
-					<div>\
-						<input type=\"number\" style=\"width: 150px\" data-bind=\"slider: {min: 00, max: 100, step: 1, value: fanSpeed, tooltip: 'hide'}\">\
-						<button class=\"btn btn-block\" style=\"width: 169px\" data-bind=\"enable: isOperational() && loginState.isUser(), click: function() { $root.sendFanSpeed() }\">" + gettext("Fan speed:") + "<span data-bind=\"text: fanSpeed() + '%'\"></span></button>\
-					</div>\
-				</div>\
-			");
+				$("#control-jog-feedrate").append("\
+					<input type=\"number\" style=\"width: 150px\" data-bind=\"slider: {min: 00, max: 100, step: 1, value: fanSpeed, tooltip: 'hide'}\">\
+					<button class=\"btn btn-block\" style=\"width: 169px\" data-bind=\"enable: isOperational() && loginState.isUser(), click: function() { $root.sendFanSpeed() }\">" + gettext("Fan speed:") + "<span data-bind=\"text: fanSpeed() + '%'\"></span></button>\
+				");
 			}
 		}
 		catch (error) {