From 690a3ff9587a9c3ff1e46e392504985bdcf8aafa Mon Sep 17 00:00:00 2001
From: Amanda Ghassaei <amandaghassaei@gmail.com>
Date: Wed, 12 Aug 2015 13:23:11 -0400
Subject: [PATCH] small changes

---
 js/menus/templates/AssemblerMenuView.html     | 2 +-
 js/menus/templates/EditComponentMenuView.html | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/js/menus/templates/AssemblerMenuView.html b/js/menus/templates/AssemblerMenuView.html
index 38ca20d0..546ff9a9 100644
--- a/js/menus/templates/AssemblerMenuView.html
+++ b/js/menus/templates/AssemblerMenuView.html
@@ -36,7 +36,7 @@ Strategy: &nbsp;&nbsp;
 <% if (allMachines[machineName].numMaterials > -1 && allMachines[machineName].numMaterials < allCAMMaterialTypes.length){ %>
     <div class="inlineWarning">Number of materials in assembly exceeds available materials ( <%= allMachines[machineName].numMaterials %> ) for assembler type.</div>
 <% } %>
-Num Materials: &nbsp;&nbsp;<%= allCAMMaterialTypes.length %><br/>
+Num Materials in Assembly: &nbsp;&nbsp;<%= allCAMMaterialTypes.length %><br/>
 <% _.each(allCAMMaterialTypes, function(material){ %>
     <label class="radio colorSwatches">
         <div class="materialColorSwatch">
diff --git a/js/menus/templates/EditComponentMenuView.html b/js/menus/templates/EditComponentMenuView.html
index d34085d2..9f51ce18 100644
--- a/js/menus/templates/EditComponentMenuView.html
+++ b/js/menus/templates/EditComponentMenuView.html
@@ -1,3 +1,4 @@
+Name: &nbsp;&nbsp;<input data-property="name" value="name" placeholder="Enter Name" class="seventyFiveWidth form-control textInput component" type="text"><br/><br/>
 Parent: &nbsp;&nbsp;
     <div class="btn-group">
         <button data-toggle="dropdown" class="btn dropdown-toggle" type="button">my parent<span class="caret"></span></button>
@@ -14,8 +15,8 @@ Children: &nbsp;&nbsp;
         <li><a class="component dropdownSelector" data-property="parent" data-value="thing" href="#">thing 2</a></li>
     </ul>
 </div><br/>
-    child 1 <a href="#" class="removeChild">Remove Child</a><br/>
-    child 2 <a href="#" class="removeChild">Remove Child</a><br/><br/>
+    child 1 <a href="#" class="removeChild">Remove</a><br/>
+    child 2 <a href="#" class="removeChild">Remove</a><br/><br/>
 STL: &nbsp;&nbsp;STL Name<br/><br/>
 <a id="uploadStl" href="#" class="btn btn-block btn-lg btn-default">Upload STL</a><br/>
 Offset (xyz):&nbsp;&nbsp;
-- 
GitLab