From 0a2884e503388ac5c6d1b270edef9a02cddd5a6b Mon Sep 17 00:00:00 2001
From: Amanda Ghassaei <amandaghassaei@gmail.com>
Date: Mon, 26 Jan 2015 23:22:49 -0500
Subject: [PATCH] added import menu
---
css/main.css | 2 +-
js/menus/ImportMenuView.js | 35 +++++++++++++++++++++++++++++++++++
js/menus/LatticeMenuView.js | 10 +---------
js/menus/MenuWrapper.js | 3 +++
main.html | 9 ++++-----
5 files changed, 44 insertions(+), 15 deletions(-)
create mode 100644 js/menus/ImportMenuView.js
diff --git a/css/main.css b/css/main.css
index b43f5b7c..7bfd82da 100644
--- a/css/main.css
+++ b/css/main.css
@@ -69,7 +69,7 @@ nav .btn {
}
#menuWrapper {
- min-width: 400px;
+ width: 400px;
height: 100%;
z-index: 2;
position: absolute;
diff --git a/js/menus/ImportMenuView.js b/js/menus/ImportMenuView.js
new file mode 100644
index 00000000..d5c6d389
--- /dev/null
+++ b/js/menus/ImportMenuView.js
@@ -0,0 +1,35 @@
+/**
+ * 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
diff --git a/js/menus/LatticeMenuView.js b/js/menus/LatticeMenuView.js
index eb142474..805b1bf5 100644
--- a/js/menus/LatticeMenuView.js
+++ b/js/menus/LatticeMenuView.js
@@ -25,14 +25,6 @@ LatticeMenuView = Backbone.View.extend({
Scale:<br/>\
Column Separation:<br/><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
diff --git a/js/menus/MenuWrapper.js b/js/menus/MenuWrapper.js
index dae27453..64cca126 100644
--- a/js/menus/MenuWrapper.js
+++ b/js/menus/MenuWrapper.js
@@ -9,6 +9,7 @@ function MenuWrapper(){
//init all tab view controllers
var latticeMenu = new LatticeMenuView();
+ var importMenu = new ImportMenuView();
var sketchMenu = new SketchMenuView();
var partMenu = new PartMenuView();
var scriptMenu = new ScriptMenuView();
@@ -28,6 +29,8 @@ function MenuWrapper(){
var tabName = $this.parent().data('name');
if (tabName == "lattice"){
latticeMenu.render();
+ } else if (tabName == "import"){
+ importMenu.render();
} else if (tabName == "sketch"){
sketchMenu.render();
} else if (tabName == "part"){
diff --git a/main.html b/main.html
index c360a3a9..42cbf8d2 100644
--- a/main.html
+++ b/main.html
@@ -55,16 +55,14 @@
<script src="js/menus/MenuWrapper.js"></script>
<script src="js/menus/Navbar.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/SketchMenuView.js"></script>
<script src="js/menus/ScriptMenuView.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/views/elementMenu.js"></script>-->
- <script src="js/menus/exportMenu.js"></script>
<link rel="stylesheet" type="text/css" href="css/main.css">
</head>
@@ -103,7 +101,8 @@
<div id="menuWrapper">
<ul class="nav nav-tabs nav-justified">
<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="script"><a href="#">Script</a></li>
</ul>
--
GitLab