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

added import menu

parent eb351e93
No related merge requests found
...@@ -69,7 +69,7 @@ nav .btn { ...@@ -69,7 +69,7 @@ nav .btn {
} }
#menuWrapper { #menuWrapper {
min-width: 400px; width: 400px;
height: 100%; height: 100%;
z-index: 2; z-index: 2;
position: absolute; position: absolute;
......
/**
* Created by aghassaei on 1/26/15.
*/
ImportMenuView = Backbone.View.extend({
el: "#menuContent",
events: {
},
initialize: function(){
_.bindAll(this, "render");
},
render: function(){
this.$el.html(this.template());
},
template: _.template('\
Rotate:<br/>\
Scale:<br/><br/>\
<span class="btn btn-default btn-file fullWidth">\
Upload STL<input id="uploadMesh" type="file">\
</span><br/><br/>\
<div class="btn-group fullWidth">\
<button data-toggle="dropdown" class="btn btn-default dropdown-toggle fullWidth" type="button">Select Model <span class="caret"></span></button>\
<ul role="menu" class="dropdown-menu">\
<li><a class="selectMesh" data-file="Airbus_A300-600.stl" href="#">Plane</a></li>\
</ul>\
</div><!-- /btn-group -->')
});
\ No newline at end of file
...@@ -25,14 +25,6 @@ LatticeMenuView = Backbone.View.extend({ ...@@ -25,14 +25,6 @@ LatticeMenuView = Backbone.View.extend({
Scale:<br/>\ Scale:<br/>\
Column Separation:<br/><br/>\ Column Separation:<br/><br/>\
<a href="#" class=" btn btn-block btn-lg btn-default">Clear All Cells</a><br/>\ <a href="#" class=" btn btn-block btn-lg btn-default">Clear All Cells</a><br/>\
<span class="btn btn-default btn-file fullWidth">\ ')
Upload STL<input id="uploadMesh" type="file">\
</span><br/><br/>\
<div class="btn-group fullWidth">\
<button data-toggle="dropdown" class="btn btn-default dropdown-toggle fullWidth" type="button">Select Model <span class="caret"></span></button>\
<ul role="menu" class="dropdown-menu">\
<li><a class="selectMesh" data-file="Airbus_A300-600.stl" href="#">Plane</a></li>\
</ul>\
</div><!-- /btn-group -->')
}); });
\ No newline at end of file
...@@ -9,6 +9,7 @@ function MenuWrapper(){ ...@@ -9,6 +9,7 @@ function MenuWrapper(){
//init all tab view controllers //init all tab view controllers
var latticeMenu = new LatticeMenuView(); var latticeMenu = new LatticeMenuView();
var importMenu = new ImportMenuView();
var sketchMenu = new SketchMenuView(); var sketchMenu = new SketchMenuView();
var partMenu = new PartMenuView(); var partMenu = new PartMenuView();
var scriptMenu = new ScriptMenuView(); var scriptMenu = new ScriptMenuView();
...@@ -28,6 +29,8 @@ function MenuWrapper(){ ...@@ -28,6 +29,8 @@ function MenuWrapper(){
var tabName = $this.parent().data('name'); var tabName = $this.parent().data('name');
if (tabName == "lattice"){ if (tabName == "lattice"){
latticeMenu.render(); latticeMenu.render();
} else if (tabName == "import"){
importMenu.render();
} else if (tabName == "sketch"){ } else if (tabName == "sketch"){
sketchMenu.render(); sketchMenu.render();
} else if (tabName == "part"){ } else if (tabName == "part"){
......
...@@ -55,16 +55,14 @@ ...@@ -55,16 +55,14 @@
<script src="js/menus/MenuWrapper.js"></script> <script src="js/menus/MenuWrapper.js"></script>
<script src="js/menus/Navbar.js"></script> <script src="js/menus/Navbar.js"></script>
<script src="js/menus/LatticeMenuView.js"></script> <script src="js/menus/LatticeMenuView.js"></script>
<script src="js/menus/ImportMenuView.js"></script>
<script src="js/menus/PartMenuView.js"></script> <script src="js/menus/PartMenuView.js"></script>
<script src="js/menus/SketchMenuView.js"></script> <script src="js/menus/SketchMenuView.js"></script>
<script src="js/menus/ScriptMenuView.js"></script> <script src="js/menus/ScriptMenuView.js"></script>
<script src="js/threeViews/threeView.js"></script> <script src="js/threeViews/threeView.js"></script>
<script src="js/menus/exportMenu.js"></script>
<script src="js/main.js"></script> <script src="js/main.js"></script>
<!--<script src="js/views/elementMenu.js"></script>-->
<script src="js/menus/exportMenu.js"></script>
<link rel="stylesheet" type="text/css" href="css/main.css"> <link rel="stylesheet" type="text/css" href="css/main.css">
</head> </head>
...@@ -103,7 +101,8 @@ ...@@ -103,7 +101,8 @@
<div id="menuWrapper"> <div id="menuWrapper">
<ul class="nav nav-tabs nav-justified"> <ul class="nav nav-tabs nav-justified">
<li role="presentation" class="active" data-name="lattice"><a href="#">Lattice</a></li> <li role="presentation" class="active" data-name="lattice"><a href="#">Lattice</a></li>
<li role="presentation" data-name="sketch"><a href="#">Sketch</a></li> <li role="presentation" data-name="import"><a href="#">Import</a></li>
<li role="presentation" data-name="sketch"><a href="#">Sketch</a></li>
<li role="presentation" data-name="part"><a href="#">Part</a></li> <li role="presentation" data-name="part"><a href="#">Part</a></li>
<li role="presentation" data-name="script"><a href="#">Script</a></li> <li role="presentation" data-name="script"><a href="#">Script</a></li>
</ul> </ul>
......
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