Commit c144c688 authored by Amanda Ghassaei's avatar Amanda Ghassaei

more plist edits

parent d2a83bf9
......@@ -32,7 +32,7 @@ define(['jquery', 'underscore', 'menuParent', 'plist', 'text!eSetupMenuTemplate'
},
_makeTemplateJSON: function(){
return _.extend(this.model.toJSON(), eSim.toJSON(), plist, {overlapDetected:lattice.get("overlapDetected")});
return _.extend(this.model.toJSON(), eSim.toJSON(), plist, lattice.toJSON());
},
template: _.template(template)
......
......@@ -3,7 +3,8 @@
*/
define(['jquery', 'underscore', 'menuParent', 'plist', 'text!mSetupMenuTemplate'], function($, _, MenuParentView, plist, template){
define(['jquery', 'underscore', 'menuParent', 'lattice', 'plist', 'text!mSetupMenuTemplate'],
function($, _, MenuParentView, lattice, plist, template){
return MenuParentView.extend({
......@@ -20,7 +21,7 @@ define(['jquery', 'underscore', 'menuParent', 'plist', 'text!mSetupMenuTemplate'
},
_makeTemplateJSON: function(){
return _.extend(this.model.toJSON(), plist);
return _.extend(this.model.toJSON(), plist. lattice.toJSON());
},
template: _.template(template)
......
......@@ -5,7 +5,7 @@ Simulation Type:   
<div class="btn-group">
<button data-toggle="dropdown" class="btn dropdown-toggle" type="button"><%= allMaterialClasses[materialClass] %><span class="caret"></span></button>
<ul role="menu" class="dropdown-menu">
<% _.each(_.keys(allMaterialClasses), function(key){ %>
<% _.each(allLattices[cellType].connection[connectionType].type[latticeType].materialClasses || _.keys(allMaterialClasses), function(key){ %>
<li><a class="appState dropdownSelector" data-property="materialClass" data-value="<%= key %>" href="#"><%= allMaterialClasses[key] %></a></li>
<% }); %>
</ul>
......
......@@ -26,9 +26,9 @@ Type:&nbsp;&nbsp;
</ul>
</div><br/><br/>
Aspect Ratio:&nbsp;&nbsp;
<input data-property="aspectRatio" data-key="x" value="<%= aspectRatio.x %>" placeholder="X" class="form-control floatInput" type="text">&nbsp;
<input data-property="aspectRatio" data-key="y" value="<%= aspectRatio.y %>" placeholder="Y" class="form-control floatInput" type="text">&nbsp;
<input data-property="aspectRatio" data-key="z" value="<%= aspectRatio.z %>" placeholder="Z" class="form-control floatInput" type="text"><br/><br/>
<input data-property="aspectRatio" data-key="x" value="<%= aspectRatio.x %>" placeholder="X" class="form-control lattice floatInput" type="text">&nbsp;
<input data-property="aspectRatio" data-key="y" value="<%= aspectRatio.y %>" placeholder="Y" class="form-control lattice floatInput" type="text">&nbsp;
<input data-property="aspectRatio" data-key="z" value="<%= aspectRatio.z %>" placeholder="Z" class="form-control lattice floatInput" type="text"><br/><br/>
<% if (connectionType == "gik") { %>
Part Length:&nbsp;&nbsp;<input data-property="gikLength" value="<%= gikLength %>" placeholder="Length" class="form-control intInput appState" type="text"><br/><br/>
<% } %>
......
......@@ -2,7 +2,7 @@ Simulation Type: &nbsp;&nbsp;
<div class="btn-group">
<button data-toggle="dropdown" class="btn dropdown-toggle" type="button"><%= allMaterialClasses[materialClass] %><span class="caret"></span></button>
<ul role="menu" class="dropdown-menu">
<% _.each(_.keys(allMaterialClasses), function(key){ %>
<% _.each(allLattices[cellType].connection[connectionType].type[latticeType].materialClasses || _.keys(allMaterialClasses), function(key){ %>
<li><a class="appState dropdownSelector" data-property="materialClass" data-value="<%= key %>" href="#"><%= allMaterialClasses[key] %></a></li>
<% }); %>
</ul>
......
......@@ -3,8 +3,8 @@
<div class="btn-group">
<button data-toggle="dropdown" class="btn dropdown-toggle" type="button"><%= allMaterialClasses[materialClass] %><span class="caret"></span></button>
<ul role="menu" class="dropdown-menu">
<% _.each(allLattices[cellType].connection[connectionType].type[latticeType].materialClasses || allMaterialClasses, function(val, key){ %>
<li><a class="appState dropdownSelector" data-property="materialClass" data-value="<%= key %>" href="#"><%= val %></a></li>
<% _.each(allLattices[cellType].connection[connectionType].type[latticeType].materialClasses || _.keys(allMaterialClasses), function(key){ %>
<li><a class="appState dropdownSelector" data-property="materialClass" data-value="<%= key %>" href="#"><%= allMaterialClasses[key] %></a></li>
<% }); %>
</ul>
</div><br/><br/>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment