diff --git a/css/main.css b/css/main.css index 3820bace5e4185957d31cd2c88692d29eb395f2a..efde705d8873275d73ce211fd29bd700b422b84f 100644 --- a/css/main.css +++ b/css/main.css @@ -4,6 +4,10 @@ body { overflow:hidden;/*hide scroll bar*/ } +html, body { + height: 100%; +} + .navbar { margin-bottom:0; z-index: 2; @@ -136,9 +140,11 @@ nav .btn { #menuContent{ padding: 30px; - height:100%; - /*min-height:100%;*/ - /*overflow-y: auto;*/ + overflow-y: scroll; + top: 100px; + bottom: 0; + position: fixed; + width: 400px; } hr { diff --git a/js/cam/ShopbotExporter.js b/js/cam/ShopbotExporter.js index a2d26f5e14dac8ba20b013dbe7f60c82ca74875e..06394390aa6aab6b7017e0c77cd587364bdcaf55 100644 --- a/js/cam/ShopbotExporter.js +++ b/js/cam/ShopbotExporter.js @@ -9,12 +9,12 @@ ShopbotExporter.prototype.makeHeader = function(){ var data = ""; data += this.addLine("FG", [], "single step mode"); data += this.addLine("SA", [], "absolute distances"); - data += this.goHome(); data += this.addLine("SM", [], "move/cut mode"); var rapidSpeeds = dmaGlobals.assembler.get("rapidSpeeds"); data += this.addLine("JS", [rapidSpeeds.xy, rapidSpeeds.z], "jog speed xy, z"); var feedRate = dmaGlobals.assembler.get("feedRate"); data += this.addLine("MS", [feedRate.xy, feedRate.z], "move speed xy, z"); + data += this.goHome(); return data; }; diff --git a/js/models/AppState.js b/js/models/AppState.js index f57e20b5e49a93b0f2074f98ac14dccc01916288..a0c152284871d6fffd37c7d6923fc8fba20108a8 100644 --- a/js/models/AppState.js +++ b/js/models/AppState.js @@ -35,9 +35,9 @@ AppState = Backbone.Model.extend({ optimize:"Optimize" }, navAssemble:{ - assembler:"Assembler", - animate:"Preview", + assembler:"Assembler", cam: "Process", + animate:"Preview", send: "Send" } }, diff --git a/main.html b/main.html index 55757d9a497fad5ceb4e9006439eef8a0013bac5..ba0b482c0324ca05d3f76ce4bee820972e8c127e 100644 --- a/main.html +++ b/main.html @@ -155,4 +155,4 @@ </body> -</html> \ No newline at end of file +</html \ No newline at end of file