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

formatting

parent e52de847
No related branches found
No related tags found
No related merge requests found
......@@ -470,6 +470,7 @@ label {
.alternatingColorList>label{
padding-right: 10px;
padding-left: 15px;
width: 100%;
}
......
......@@ -61,7 +61,18 @@ define(['jquery', 'underscore', 'menuParent', 'camPlist', 'cam', 'text!assembler
},
_makeTemplateJSON: function(){
return _.extend(this.model.toJSON(), cam.toJSON(), cam.get("assembler").toJSON());
return _.extend(this.model.toJSON(), cam.toJSON(), cam.get("assembler").toJSON(),
{customFns: {
customFunctionsContext: "Context Variables",
customCalcPositionOffsets: "Calc Position Offsets",
customHeader: "Header",
customHome: "Go Home",
customMoveXY: "Move XY",
customChangeZLayer: "Change Z",
customPlacePart: "Place Part",
customFooter: "Footer"
}}
);
},
template: _.template(template)
......
......@@ -21,13 +21,12 @@ Rotation (xyz):  
Scale: &nbsp;&nbsp;<input data-property="scale" value="<%= scale %>" placeholder="Scale" class="form-control floatInput assembler" type="text"><br/><br/>
Edit Code:<br/><br/>
Context Variables <a class="editMachineCode" data-name="customFunctionsContext" href="#">Edit</a><br/>
Position Offsets <a class="editMachineCode" data-name="customCalcPositionOffsets" href="#">Edit</a><br/>
Header <a class="editMachineCode" data-name="customHeader" href="#">Edit</a><br/>
Go Home <a class="editMachineCode" data-name="customHome" href="#">Edit</a><br/>
<% var treeLevel = 0;
_.each(customFns, function(description, key){ %>
<% treeLevel++; %>
<div class="alternatingColorList<% if (treeLevel%2 == 0){ %> evenListItem <% } %>">
<label><%= description %> <a class="editMachineCode pull-right" data-name="<%= key %>" href="#">Edit</a></label>
</div><br/>
<% }); %><br/>
<!--Pick up stock <a class="editMachineCode" data-name="customHeader" href="#">Edit</a><br/>-->
Move XY <a class="editMachineCode" data-name="customMoveXY" href="#">Edit</a><br/>
Change Z <a class="editMachineCode" data-name="customChangeZLayer" href="#">Edit</a><br/>
Place part <a class="editMachineCode" data-name="customPlacePart" href="#">Edit</a><br/>
Footer <a class="editMachineCode" data-name="customFooter" href="#">Edit</a><br/><br/>
<a href="#" id="saveMachineConfig" class=" btn btn-block btn-lg btn-success">Save Machine Files</a><br/>
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