From 96dd8b71607a283bf96eb468304ef488eb8828c5 Mon Sep 17 00:00:00 2001
From: Amanda Ghassaei <amandaghassaei@gmail.com>
Date: Fri, 21 Aug 2015 01:18:58 -0400
Subject: [PATCH] formatting

---
 css/main.css                                   |  1 +
 js/menus/AssemblerSetupMenuView.js             | 13 ++++++++++++-
 js/menus/templates/AssemblerSetupMenuView.html | 15 +++++++--------
 3 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/css/main.css b/css/main.css
index 3bc5a948..d715bf8b 100644
--- a/css/main.css
+++ b/css/main.css
@@ -470,6 +470,7 @@ label {
 
 .alternatingColorList>label{
     padding-right: 10px;
+    padding-left: 15px;
     width: 100%;
 }
 
diff --git a/js/menus/AssemblerSetupMenuView.js b/js/menus/AssemblerSetupMenuView.js
index e1d0c403..e8064308 100644
--- a/js/menus/AssemblerSetupMenuView.js
+++ b/js/menus/AssemblerSetupMenuView.js
@@ -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)
diff --git a/js/menus/templates/AssemblerSetupMenuView.html b/js/menus/templates/AssemblerSetupMenuView.html
index 49077ade..daa64a7a 100644
--- a/js/menus/templates/AssemblerSetupMenuView.html
+++ b/js/menus/templates/AssemblerSetupMenuView.html
@@ -21,13 +21,12 @@ Rotation (xyz):&nbsp;&nbsp;
 
 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/>
-- 
GitLab