Skip to content
Snippets Groups Projects
Commit 690a3ff9 authored by Amanda Ghassaei's avatar Amanda Ghassaei
Browse files

small changes

parent 089e3f51
No related branches found
No related tags found
No related merge requests found
......@@ -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: &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">
......
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;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment