diff --git a/js/menus/templates/AssemblerMenuView.html b/js/menus/templates/AssemblerMenuView.html index 38ca20d02edf01a45ccc1185021b698c9228a8bf..546ff9a9d2508745e3d2b3090b5ba6df68205890 100644 --- a/js/menus/templates/AssemblerMenuView.html +++ b/js/menus/templates/AssemblerMenuView.html @@ -36,7 +36,7 @@ Strategy: <% 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: <%= allCAMMaterialTypes.length %><br/> +Num Materials in Assembly: <%= 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 d34085d211f8ed46e213592a6eea0ce385ef8bf7..9f51ce18bffa617392de54293b121d09f27aea56 100644 --- a/js/menus/templates/EditComponentMenuView.html +++ b/js/menus/templates/EditComponentMenuView.html @@ -1,3 +1,4 @@ +Name: <input data-property="name" value="name" placeholder="Enter Name" class="seventyFiveWidth form-control textInput component" type="text"><br/><br/> Parent: <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: <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: STL Name<br/><br/> <a id="uploadStl" href="#" class="btn btn-block btn-lg btn-default">Upload STL</a><br/> Offset (xyz):