From bc12be63b8efca7c1daeb64aa7952b221961c094 Mon Sep 17 00:00:00 2001
From: Amanda Ghassaei <amandaghassaei@gmail.com>
Date: Mon, 9 Mar 2015 00:55:52 -0400
Subject: [PATCH] ui stuff

---
 js/menus/LatticeMenuView.js | 8 ++++----
 js/menus/MenuWrapperView.js | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/js/menus/LatticeMenuView.js b/js/menus/LatticeMenuView.js
index 884e7324..1c04e340 100644
--- a/js/menus/LatticeMenuView.js
+++ b/js/menus/LatticeMenuView.js
@@ -153,7 +153,7 @@ LatticeMenuView = Backbone.View.extend({
                         <li><a class="connectionType" data-type="<%= key %>" href="#"><%= allConnectionTypes[cellType][key] %></a></li>\
                     <% }); %>\
                 </ul>\
-            </div><br/><br/>\
+            </div><br/>\
         <% if (connectionType == "freeformFace") { %>\
         Current Draw Shape:&nbsp;&nbsp;\
             <div class="btn-group">\
@@ -162,18 +162,18 @@ LatticeMenuView = Backbone.View.extend({
                     <li><a id="freeformOctaCell" href="#">octa</a></li>\
                     <li><a id="freeformTetraCell" href="#">tetra</a></li>\
                 </ul>\
-            </div><br/>\
+            </div>\
         <% } else { %>\
         <label class="checkbox">\
             <input type="checkbox" <% if (shouldPreserveCells) { %> checked="checked" <% } %> value="" id="preserveCells" data-toggle="checkbox" class="custom-checkbox"><span class="icons"><span class="icon-unchecked"></span><span class="icon-checked"></span></span>\
             Preserve cells on lattice change\
         </label>\
         <% } %>\
-        <br/><br/>\
+        <br/>\
         <label class="checkbox">\
             <input type="checkbox"  <% if (inverseMode) { %> checked="checked" <% } %> value="" id="showInverse" data-toggle="checkbox" class="custom-checkbox"><span class="icons"><span class="icon-unchecked"></span><span class="icon-checked"></span></span>\
             Show Inverse Geometry (hold "i" key)\
-        </label><br/><br/>\
+        </label><br/>\
         Scale:&nbsp;&nbsp;<input id="scaleSlider" data-slider-id="ex1Slider" type="text" data-slider-min="1" data-slider-max="100" data-slider-step="0.1" data-slider-value="<%= scale %>"/>\
         <br/><input id="latticeScale" value="<%= scale %>" placeholder="enter scale" class="form-control" type="text"><br/>\
         Num Cells:&nbsp;&nbsp;<%= numCells %><br/>\
diff --git a/js/menus/MenuWrapperView.js b/js/menus/MenuWrapperView.js
index ebda808a..fb6c4840 100644
--- a/js/menus/MenuWrapperView.js
+++ b/js/menus/MenuWrapperView.js
@@ -32,7 +32,7 @@ MenuWrapper = Backbone.View.extend({
         //data names and titles
         this.designMenuTabs = {lattice:"Lattice", import:"Import", sketch:"Sketch", part:"Part", script:"Script"};
         this.simMenuTabs = {physics:"Physics", part:"Part", material:"Material", optimize:"Optimize"};
-        this.assemMenuTabs = {assembler:"Assembler", animate:"Animate"};
+        this.assemMenuTabs = {assembler:"Assembler", animate:"Animate", cam: "CAM"};
 
         //bind events
         this.listenTo(this.model, "change:currentNav", this.render);
@@ -82,7 +82,7 @@ MenuWrapper = Backbone.View.extend({
             this.animationMenu.render();
         } else {
             console.warn("no tab initialized!");
-            $("#menuContent").html('Something goes here eventually.');//clear out content from menu
+            $("#menuContent").html('Coming Soon.');//clear out content from menu
         }
 
     },
-- 
GitLab