From 750b6c7fe6c73d6131f2a523758abb0eb8460073 Mon Sep 17 00:00:00 2001
From: Amanda Ghassaei <amandaghassaei@gmail.com>
Date: Mon, 26 Oct 2015 18:36:06 -0400
Subject: [PATCH] organizing ui stuff
---
css/main.css | 18 +++++++
index.html | 6 +++
js/main.js | 71 +++------------------------
js/menus/AnimationMenuView.js | 2 +-
js/menus/AssemblerMenuView.js | 2 +-
js/menus/AssemblerSetupMenuView.js | 2 +-
js/menus/CamMenuView.js | 2 +-
js/menus/CompositeMenuView.js | 2 +-
js/menus/DiscoveryMenuView.js | 2 +-
js/menus/EDynamicMenuView.js | 3 +-
js/menus/ESetupMenuView.js | 2 +-
js/menus/EStaticMenuView.js | 2 +-
js/menus/EditCamOutputMenuView.js | 2 +-
js/menus/EditComponentMenuView.js | 2 +-
js/menus/ImportMenuView.js | 2 +-
js/menus/LatticeMenuView.js | 3 +-
js/menus/MDynamicMenuView.js | 3 +-
js/menus/MSetupMenuView.js | 2 +-
js/menus/MStaticMenuView.js | 3 +-
js/menus/MaterialEditorMenuView.js | 2 +-
js/menus/MaterialMenuView.js | 2 +-
js/menus/MenuWrapperView.js | 4 +-
js/menus/OptimizationMenuView.js | 3 +-
js/menus/PartMenuView.js | 3 +-
js/menus/ScriptMenuView.js | 3 +-
js/menus/SendMenuView.js | 2 +-
js/menus/SetupCommMenuView.js | 2 +-
js/menus/otherUI/Console.js | 11 +++++
js/menus/{ => otherUI}/ModalView.js | 2 +-
js/menus/{ => otherUI}/NavViewMenu.js | 2 +-
js/menus/{ => otherUI}/Navbar.js | 0
js/menus/{ => otherUI}/Ribbon.js | 2 +-
js/menus/{ => otherUI}/ScriptView.js | 0
33 files changed, 79 insertions(+), 90 deletions(-)
create mode 100644 js/menus/otherUI/Console.js
rename js/menus/{ => otherUI}/ModalView.js (85%)
rename js/menus/{ => otherUI}/NavViewMenu.js (97%)
rename js/menus/{ => otherUI}/Navbar.js (100%)
rename js/menus/{ => otherUI}/Ribbon.js (95%)
rename js/menus/{ => otherUI}/ScriptView.js (100%)
diff --git a/css/main.css b/css/main.css
index 2f410321..7ed1e490 100644
--- a/css/main.css
+++ b/css/main.css
@@ -563,4 +563,22 @@ label {
#contextMenu li>a{
text-decoration: none;
+}
+
+#console {
+ z-index: 2;
+ width: 100%;
+ position: absolute;
+ background-color: clear;
+}
+
+#console>div{
+ background-color: red;
+ height: 100%;
+}
+#consoleInput{
+ border-radius: 0;
+}
+#consoleOutput{
+ min-height:50px;
}
\ No newline at end of file
diff --git a/index.html b/index.html
index 2d464ddb..c2c1f353 100644
--- a/index.html
+++ b/index.html
@@ -128,6 +128,12 @@
<div class="modal fade" id="genericModal" tabindex="-1" role="dialog" aria-labelledby="basicModal" aria-hidden="true"></div>
+<div id="console">
+ <div>
+ <div id="consoleOutput"></div>
+ <input id="consoleInput" value="" placeholder="Type Command" class="form-control" type="text">
+ </div>
+</div>
<div id="menuWrapper"><div id="menuHeader"></div><div id="menuContent"></div></div>
<div id="scriptView"></div>
<div id="navRibbon"></div>
diff --git a/js/main.js b/js/main.js
index 5fbc1e55..e7839f8b 100644
--- a/js/main.js
+++ b/js/main.js
@@ -123,71 +123,15 @@ require.config({
compositeMaterial: 'materials/DMACompositeMaterial',
//UI
- navbar: 'menus/Navbar',
- navViewMenu: 'menus/NavViewMenu',//view dropdown
- ribbon: 'menus/Ribbon',
- modalView: 'menus/ModalView',
+ navbar: 'menus/otherUI/Navbar',
+ navViewMenu: 'menus/otherUI/NavViewMenu',//view dropdown
+ ribbon: 'menus/otherUI/Ribbon',
+ modalView: 'menus/otherUI/ModalView',
+ console: 'menus/otherUI/Console',
contextMenu: 'menus/contextMenu/ContextMenu',
+ scriptView: 'menus/otherUI/ScriptView',
menuWrapper: 'menus/MenuWrapperView',
menuParent: 'menus/MenuParentView',
- latticeMenu: 'menus/LatticeMenuView',
- importMenu: 'menus/ImportMenuView',
- partMenu: 'menus/PartMenuView',
- scriptMenu: 'menus/ScriptMenuView',
- materialMenu: 'menus/MaterialMenuView',
- materialPropertiesMenu: 'menus/MaterialPropertiesMenuView',
- optimizeMenu: 'menus/OptimizationMenuView',
- assemblerMenu: 'menus/AssemblerMenuView',
- camMenu: 'menus/CamMenuView',
- editCamOutputMenu: 'menus/EditCamOutputMenuView',
- animateMenu: 'menus/AnimationMenuView',
- sendMenu: 'menus/SendMenuView',
- compositeMenu: 'menus/CompositeMenuView',
- materialEditorMenu: 'menus/MaterialEditorMenuView',
- setupCommMenu: 'menus/SetupCommMenuView',
- discoveryMenu: 'menus/DiscoveryMenuView',
- eSetupMenu: 'menus/ESetupMenuView',
- eStaticMenu: 'menus/EStaticMenuView',
- eDynamicMenu: 'menus/EDynamicMenuView',
- mSetupMenu: 'menus/MSetupMenuView',
- mStaticMenu: 'menus/MStaticMenuView',
- mDynamicMenu: 'menus/MDynamicMenuView',
- dnaSetupMenu: 'menus/DNASimSetupMenuView',
- dnaExportMenu: 'menus/DNAExportMenuView',
- assemblerSetupMenu: 'menus/AssemblerSetupMenuView',
- editComponentMenu: 'menus/EditComponentMenuView',
- commParentMenu: 'menus/CommParentMenu',
- serialMonitorController: 'SerialMonitor/SerialMonitorController',
-
- //templates
- navViewMenuTemplate: 'menus/templates/NavViewMenu.html',
- ribbonTemplate: 'menus/templates/Ribbon.html',
- modalViewTemplate: 'menus/templates/ModalView.html',
- scriptView: 'menus/ScriptView',
- menuWrapperTemplate: 'menus/templates/MenuWrapperView.html',
- latticeMenuTemplate: 'menus/templates/LatticeMenuView.html',
- importMenuTemplate: 'menus/templates/ImportMenuView.html',
- partMenuTemplate: 'menus/templates/PartMenuView.html',
- scriptMenuTemplate: 'menus/templates/ScriptMenuView.html',
- materialMenuTemplate: 'menus/templates/MaterialMenuView.html',
- optimizeMenuTemplate: 'menus/templates/OptimizationMenuView.html',
- assemblerMenuTemplate: 'menus/templates/AssemblerMenuView.html',
- camMenuTemplate: 'menus/templates/CamMenuView.html',
- editCamOutputMenuTemplate: 'menus/templates/EditCamOutputMenuView.html',
- animationMenuTemplate: 'menus/templates/AnimationMenuView.html',
- sendMenuTemplate: 'menus/templates/SendMenuView.html',
- compositeMenuTemplate: 'menus/templates/CompositeMenuView.html',
- materialEditorMenuTemplate: 'menus/templates/MaterialEditorMenuView.html',
- setupCommMenuTemplate: 'menus/templates/SetupCommMenuView.html',
- discoveryMenuTemplate: 'menus/templates/DiscoveryMenuView.html',
- eSetupMenuTemplate: 'menus/templates/ESetupMenuView.html',
- eStaticMenuTemplate: 'menus/templates/EStaticMenuView.html',
- eDynamicMenuTemplate: 'menus/templates/EDynamicMenuView.html',
- mSetupMenuTemplate: 'menus/templates/MSetupMenuView.html',
- mStaticMenuTemplate: 'menus/templates/MStaticMenuView.html',
- mDynamicMenuTemplate: 'menus/templates/MDynamicMenuView.html',
- assemblerSetupMenuTemplate: 'menus/templates/AssemblerSetupMenuView.html',
- editComponentMenuTemplate: 'menus/templates/EditComponentMenuView.html',
//electronic sim
eSimPlist: 'plists/ESimPlist',
@@ -282,7 +226,8 @@ require.config({
//};
//init stuff
-require(['appState', 'lattice', 'navbar', 'threeModel', 'threeView', 'globals', 'flatUI', 'bootstrapSlider', 'ribbon', 'menuWrapper', 'scriptView', 'contextMenu'],
+require(['appState', 'lattice', 'navbar', 'threeModel', 'threeView', 'globals',
+ 'flatUI', 'bootstrapSlider', 'ribbon', 'menuWrapper', 'scriptView', 'contextMenu', 'console'],
function(appState, lattice, Navbar, three, ThreeView, globals){
new Navbar({model:appState});
diff --git a/js/menus/AnimationMenuView.js b/js/menus/AnimationMenuView.js
index 229c32e2..050f715b 100644
--- a/js/menus/AnimationMenuView.js
+++ b/js/menus/AnimationMenuView.js
@@ -2,7 +2,7 @@
* Created by aghassaei on 2/1/15.
*/
-define(['jquery', 'underscore', 'menuParent', 'cam', 'text!animationMenuTemplate'],
+define(['jquery', 'underscore', 'menuParent', 'cam', 'text!menus/templates/AnimationMenuView.html'],
function($, _, MenuParentView, cam, template){
return MenuParentView.extend({
diff --git a/js/menus/AssemblerMenuView.js b/js/menus/AssemblerMenuView.js
index aacf4129..ea5f637f 100644
--- a/js/menus/AssemblerMenuView.js
+++ b/js/menus/AssemblerMenuView.js
@@ -2,7 +2,7 @@
* Created by aghassaei on 2/25/15.
*/
-define(['jquery', 'underscore', 'menuParent', 'camPlist', 'cam', 'lattice', 'materials', 'text!assemblerMenuTemplate'],
+define(['jquery', 'underscore', 'menuParent', 'camPlist', 'cam', 'lattice', 'materials', 'text!menus/templates/AssemblerMenuView.html'],
function($, _, MenuParentView, camPlist, cam, lattice, materials, template){
return MenuParentView.extend({
diff --git a/js/menus/AssemblerSetupMenuView.js b/js/menus/AssemblerSetupMenuView.js
index e8064308..a990ff24 100644
--- a/js/menus/AssemblerSetupMenuView.js
+++ b/js/menus/AssemblerSetupMenuView.js
@@ -3,7 +3,7 @@
*/
-define(['jquery', 'underscore', 'menuParent', 'camPlist', 'cam', 'text!assemblerSetupMenuTemplate'],
+define(['jquery', 'underscore', 'menuParent', 'camPlist', 'cam', 'text!menus/templates/AssemblerSetupMenuView.html''],
function($, _, MenuParentView, camPlist, cam, template){
return MenuParentView.extend({
diff --git a/js/menus/CamMenuView.js b/js/menus/CamMenuView.js
index e14a6bca..a9c4c78c 100644
--- a/js/menus/CamMenuView.js
+++ b/js/menus/CamMenuView.js
@@ -2,7 +2,7 @@
* Created by aghassaei on 1/26/15.
*/
-define(['jquery', 'underscore', 'menuParent', 'camPlist', 'plist', 'cam', 'lattice', 'text!camMenuTemplate'],
+define(['jquery', 'underscore', 'menuParent', 'camPlist', 'plist', 'cam', 'lattice', 'text!menus/templates/CamMenuView.html'],
function($, _, MenuParentView, camPlist, plist, cam, lattice, template){
return MenuParentView.extend({
diff --git a/js/menus/CompositeMenuView.js b/js/menus/CompositeMenuView.js
index a2f13cdb..e45a8d5e 100644
--- a/js/menus/CompositeMenuView.js
+++ b/js/menus/CompositeMenuView.js
@@ -2,7 +2,7 @@
* Created by aghassaei on 6/10/15.
*/
-define(['jquery', 'underscore', 'menuParent', 'compositeEditorLattice', 'materialsPlist', 'lattice', 'globals', 'materials', 'text!compositeMenuTemplate'],
+define(['jquery', 'underscore', 'menuParent', 'compositeEditorLattice', 'materialsPlist', 'lattice', 'globals', 'materials', 'text!menus/templates/CompositeMenuView.html'],
function($, _, MenuParentView, CompositeEditorLattice, materialsPlist, lattice, globals, materials, template){
var bounds;
diff --git a/js/menus/DiscoveryMenuView.js b/js/menus/DiscoveryMenuView.js
index befc83a6..bfe1252c 100644
--- a/js/menus/DiscoveryMenuView.js
+++ b/js/menus/DiscoveryMenuView.js
@@ -3,7 +3,7 @@
*/
-define(['jquery', 'underscore', 'menuParent', 'plist', 'lattice', 'text!discoveryMenuTemplate'],
+define(['jquery', 'underscore', 'menuParent', 'plist', 'lattice', 'text!menus/templates/DiscoveryMenuView.html'],
function($, _, MenuParentView, plist, lattice, template){
var log = "testing<br/>hello";
diff --git a/js/menus/EDynamicMenuView.js b/js/menus/EDynamicMenuView.js
index 21cabc1a..de8e1bb4 100644
--- a/js/menus/EDynamicMenuView.js
+++ b/js/menus/EDynamicMenuView.js
@@ -3,7 +3,8 @@
*/
-define(['jquery', 'underscore', 'menuParent', 'plist', 'text!eDynamicMenuTemplate'], function($, _, MenuParentView, plist, template){
+define(['jquery', 'underscore', 'menuParent', 'plist', 'text!menus/templates/EDynamicMenuView.html'],
+ function($, _, MenuParentView, plist, template){
return MenuParentView.extend({
diff --git a/js/menus/ESetupMenuView.js b/js/menus/ESetupMenuView.js
index 8bc8a982..7abeafa5 100644
--- a/js/menus/ESetupMenuView.js
+++ b/js/menus/ESetupMenuView.js
@@ -2,7 +2,7 @@
* Created by aghassaei on 2/25/15.
*/
-define(['jquery', 'underscore', 'menuParent', 'plist', 'materialsPlist', 'text!eSetupMenuTemplate', 'latticeESim', 'eSim'],
+define(['jquery', 'underscore', 'menuParent', 'plist', 'materialsPlist', 'text!menus/templates/ESetupMenuView.html', 'latticeESim', 'eSim'],
function($, _, MenuParentView, plist, materialsPlist, template, lattice, eSim){
return MenuParentView.extend({
diff --git a/js/menus/EStaticMenuView.js b/js/menus/EStaticMenuView.js
index 48e91a86..72f70627 100644
--- a/js/menus/EStaticMenuView.js
+++ b/js/menus/EStaticMenuView.js
@@ -3,7 +3,7 @@
*/
-define(['jquery', 'underscore', 'menuParent', 'eSimPlist', 'text!eStaticMenuTemplate', 'eSim', 'latticeESim'],
+define(['jquery', 'underscore', 'menuParent', 'eSimPlist', 'text!menus/templates/EStaticMenuView.html', 'eSim', 'latticeESim'],
function($, _, MenuParentView, eSimPlist, template, eSim, lattice){
return MenuParentView.extend({
diff --git a/js/menus/EditCamOutputMenuView.js b/js/menus/EditCamOutputMenuView.js
index 77837d21..106e5cf9 100644
--- a/js/menus/EditCamOutputMenuView.js
+++ b/js/menus/EditCamOutputMenuView.js
@@ -2,7 +2,7 @@
* Created by aghassaei on 7/12/15.
*/
-define(['jquery', 'underscore', 'menuParent', 'plist', 'text!editCamOutputMenuTemplate'],
+define(['jquery', 'underscore', 'menuParent', 'plist', 'text!menus/templates/EditCamOutputMenuView.html'],
function($, _, MenuParentView, plist, template){
diff --git a/js/menus/EditComponentMenuView.js b/js/menus/EditComponentMenuView.js
index c1545eb1..7012c6fc 100644
--- a/js/menus/EditComponentMenuView.js
+++ b/js/menus/EditComponentMenuView.js
@@ -3,7 +3,7 @@
*/
-define(['jquery', 'underscore', 'menuParent', 'plist', 'materialsPlist', 'cam', 'materials', 'text!editComponentMenuTemplate'],
+define(['jquery', 'underscore', 'menuParent', 'plist', 'materialsPlist', 'cam', 'materials', 'text!menus/templates/EditComponentMenuView.html'],
function($, _, MenuParentView, plist, materialsPlist, cam, materials, template){
return MenuParentView.extend({
diff --git a/js/menus/ImportMenuView.js b/js/menus/ImportMenuView.js
index 761a4f2d..9b858d03 100644
--- a/js/menus/ImportMenuView.js
+++ b/js/menus/ImportMenuView.js
@@ -2,7 +2,7 @@
* Created by aghassaei on 1/26/15.
*/
-define(['jquery', 'underscore', 'menuParent', 'plist', 'lattice', 'text!importMenuTemplate', 'fillGeometry', 'stlLoader'],
+define(['jquery', 'underscore', 'menuParent', 'plist', 'lattice', 'text!menus/templates/ImportMenuView.html', 'fillGeometry', 'stlLoader'],
function($, _, MenuParentView, plist, lattice, template, fillGeometry, THREE){
return MenuParentView.extend({
diff --git a/js/menus/LatticeMenuView.js b/js/menus/LatticeMenuView.js
index 8be261c9..44bd3e82 100644
--- a/js/menus/LatticeMenuView.js
+++ b/js/menus/LatticeMenuView.js
@@ -2,7 +2,8 @@
* Created by aghassaei on 1/26/15.
*/
-define(['jquery', 'underscore', 'menuParent', 'plist', 'lattice', 'text!latticeMenuTemplate'], function($, _, MenuParentView, plist, lattice, template){
+define(['jquery', 'underscore', 'menuParent', 'plist', 'lattice', 'text!menus/templates/LatticeMenuView.html'],
+ function($, _, MenuParentView, plist, lattice, template){
return MenuParentView.extend({
diff --git a/js/menus/MDynamicMenuView.js b/js/menus/MDynamicMenuView.js
index f0295769..207629dd 100644
--- a/js/menus/MDynamicMenuView.js
+++ b/js/menus/MDynamicMenuView.js
@@ -2,7 +2,8 @@
* Created by aghassaei on 6/30/15.
*/
-define(['jquery', 'underscore', 'menuParent', 'plist', 'text!mDynamicMenuTemplate'], function($, _, MenuParentView, plist, template){
+define(['jquery', 'underscore', 'menuParent', 'plist', 'text!menus/templates/MDynamicMenuView.html'],
+ function($, _, MenuParentView, plist, template){
return MenuParentView.extend({
diff --git a/js/menus/MSetupMenuView.js b/js/menus/MSetupMenuView.js
index 778b7ca1..8b9430be 100644
--- a/js/menus/MSetupMenuView.js
+++ b/js/menus/MSetupMenuView.js
@@ -3,7 +3,7 @@
*/
-define(['jquery', 'underscore', 'menuParent', 'lattice', 'plist', 'materialsPlist', 'text!mSetupMenuTemplate'],
+define(['jquery', 'underscore', 'menuParent', 'lattice', 'plist', 'materialsPlist', 'text!menus/templates/MSetupMenuView.html'],
function($, _, MenuParentView, lattice, plist, materialsPlist, template){
return MenuParentView.extend({
diff --git a/js/menus/MStaticMenuView.js b/js/menus/MStaticMenuView.js
index 851b5d15..02954a30 100644
--- a/js/menus/MStaticMenuView.js
+++ b/js/menus/MStaticMenuView.js
@@ -3,7 +3,8 @@
*/
-define(['jquery', 'underscore', 'menuParent', 'plist', 'text!mStaticMenuTemplate'], function($, _, MenuParentView, plist, template){
+define(['jquery', 'underscore', 'menuParent', 'plist', 'text!menus/templates/MStaticMenuView.html'],
+ function($, _, MenuParentView, plist, template){
return MenuParentView.extend({
diff --git a/js/menus/MaterialEditorMenuView.js b/js/menus/MaterialEditorMenuView.js
index f100e3eb..f44ab0bf 100644
--- a/js/menus/MaterialEditorMenuView.js
+++ b/js/menus/MaterialEditorMenuView.js
@@ -3,7 +3,7 @@
*/
-define(['jquery', 'underscore', 'menuParent', 'plist', 'materials', 'text!materialEditorMenuTemplate', 'fileSaver'],
+define(['jquery', 'underscore', 'menuParent', 'plist', 'materials', 'text!menus/templates/MaterialEditorMenuView.html', 'fileSaver'],
function($, _, MenuParentView, plist, materials, template, fileSaver){
return MenuParentView.extend({
diff --git a/js/menus/MaterialMenuView.js b/js/menus/MaterialMenuView.js
index 30ad7a13..30e738fc 100644
--- a/js/menus/MaterialMenuView.js
+++ b/js/menus/MaterialMenuView.js
@@ -2,7 +2,7 @@
* Created by aghassaei on 2/25/15.
*/
-define(['jquery', 'underscore', 'menuParent', 'materialsPlist', 'plist', 'lattice', 'globals', 'materials', 'text!materialMenuTemplate'],
+define(['jquery', 'underscore', 'menuParent', 'materialsPlist', 'plist', 'lattice', 'globals', 'materials', 'text!menus/templates/MaterialMenuView.html'],
function($, _, MenuParentView, materialsPlist, plist, lattice, globals, materials, template){
return MenuParentView.extend({
diff --git a/js/menus/MenuWrapperView.js b/js/menus/MenuWrapperView.js
index c0274246..cae227bf 100644
--- a/js/menus/MenuWrapperView.js
+++ b/js/menus/MenuWrapperView.js
@@ -3,7 +3,7 @@
*/
-define(['jquery', 'underscore', 'plist', 'backbone', 'lattice', 'appState', 'text!menuWrapperTemplate'],
+define(['jquery', 'underscore', 'plist', 'backbone', 'lattice', 'appState', 'text!menus/templates/MenuWrapperView.html'],
function($, _, plist, Backbone, lattice, appState, template){
var MenuWrapperView = Backbone.View.extend({
@@ -359,11 +359,13 @@ define(['jquery', 'underscore', 'plist', 'backbone', 'lattice', 'appState', 'tex
_hide: function(callback, suppressModelUpdate){
this.$el.animate({right: "-430"}, {done: callback});
+ $("#console").animate({"padding-right":"0"});
if (!suppressModelUpdate) this.model.set("menuIsVisible", false);
},
_show: function(){
this.$el.animate({right: "0"});
+ $("#console").animate({"padding-right":"430px"});
this.model.set("menuIsVisible", true);
},
diff --git a/js/menus/OptimizationMenuView.js b/js/menus/OptimizationMenuView.js
index c1e1d114..c768e5b7 100644
--- a/js/menus/OptimizationMenuView.js
+++ b/js/menus/OptimizationMenuView.js
@@ -2,7 +2,8 @@
* Created by aghassaei on 2/25/15.
*/
-define(['jquery', 'underscore', 'menuParent', 'plist', 'text!optimizeMenuTemplate'], function($, _, MenuParentView, plist, template){
+define(['jquery', 'underscore', 'menuParent', 'plist', 'text!menus/templates/OptimizationMenuView.html'],
+ function($, _, MenuParentView, plist, template){
return MenuParentView.extend({
diff --git a/js/menus/PartMenuView.js b/js/menus/PartMenuView.js
index 9e577112..31039679 100644
--- a/js/menus/PartMenuView.js
+++ b/js/menus/PartMenuView.js
@@ -2,7 +2,8 @@
* Created by aghassaei on 1/26/15.
*/
-define(['jquery', 'underscore', 'menuParent', 'plist', 'lattice', 'text!partMenuTemplate'], function($, _, MenuParentView, plist, lattice, template){
+define(['jquery', 'underscore', 'menuParent', 'plist', 'lattice', 'text!menus/templates/PartMenuView.html'],
+ function($, _, MenuParentView, plist, lattice, template){
return MenuParentView.extend({
diff --git a/js/menus/ScriptMenuView.js b/js/menus/ScriptMenuView.js
index 311e65fc..221ca711 100644
--- a/js/menus/ScriptMenuView.js
+++ b/js/menus/ScriptMenuView.js
@@ -2,7 +2,8 @@
* Created by aghassaei on 1/26/15.
*/
-define(['jquery', 'underscore', 'menuParent', 'plist', 'text!scriptMenuTemplate'], function($, _, MenuParentView, plist, template){
+define(['jquery', 'underscore', 'menuParent', 'plist', 'text!menus/templates/ScriptMenuView.html'],
+ function($, _, MenuParentView, plist, template){
return MenuParentView.extend({
diff --git a/js/menus/SendMenuView.js b/js/menus/SendMenuView.js
index af30e434..349c249b 100644
--- a/js/menus/SendMenuView.js
+++ b/js/menus/SendMenuView.js
@@ -2,7 +2,7 @@
* Created by aghassaei on 3/11/15.
*/
-define(['jquery', 'underscore', 'menuParent', 'serialComm', 'commPlist', 'text!sendMenuTemplate', 'text!menus/templates/SendControlPanel.html', 'cam', 'camPlist'],
+define(['jquery', 'underscore', 'menuParent', 'serialComm', 'commPlist', 'text!menus/templates/SendMenuView.html', 'text!menus/templates/SendControlPanel.html', 'cam', 'camPlist'],
function($, _, MenuParent, serialComm, commPlist, template, controlPanelTemplate, cam, camPlist){
return MenuParent.extend({
diff --git a/js/menus/SetupCommMenuView.js b/js/menus/SetupCommMenuView.js
index 919c6b0d..5e6fec55 100644
--- a/js/menus/SetupCommMenuView.js
+++ b/js/menus/SetupCommMenuView.js
@@ -3,7 +3,7 @@
*/
-define(['jquery', 'underscore', 'commParentMenu', 'serialComm', 'text!setupCommMenuTemplate', 'commPlist'],
+define(['jquery', 'underscore', 'commParentMenu', 'serialComm', 'text!menus/templates/SetupCommMenuView.html', 'commPlist'],
function($, _, CommParentMenu, serialComm, template, commPlist){
diff --git a/js/menus/otherUI/Console.js b/js/menus/otherUI/Console.js
new file mode 100644
index 00000000..c7ee225e
--- /dev/null
+++ b/js/menus/otherUI/Console.js
@@ -0,0 +1,11 @@
+/**
+ * Created by aghassaei on 10/26/15.
+ */
+
+
+define(['jquery'], function($){
+
+// $( ".selector" ).resizable({ handles: "n, e, s, w" });
+
+
+});
\ No newline at end of file
diff --git a/js/menus/ModalView.js b/js/menus/otherUI/ModalView.js
similarity index 85%
rename from js/menus/ModalView.js
rename to js/menus/otherUI/ModalView.js
index 01ec6ffc..eec90e2c 100644
--- a/js/menus/ModalView.js
+++ b/js/menus/otherUI/ModalView.js
@@ -3,7 +3,7 @@
*/
-define(['jquery', 'underscore', 'backbone', 'text!modalViewTemplate'], function($, _, Backbone, template){
+define(['jquery', 'underscore', 'backbone', 'text!menus/templates/ModalView.html'], function($, _, Backbone, template){
return Backbone.View.extend({
diff --git a/js/menus/NavViewMenu.js b/js/menus/otherUI/NavViewMenu.js
similarity index 97%
rename from js/menus/NavViewMenu.js
rename to js/menus/otherUI/NavViewMenu.js
index bdc64576..923df15c 100644
--- a/js/menus/NavViewMenu.js
+++ b/js/menus/otherUI/NavViewMenu.js
@@ -3,7 +3,7 @@
*/
-define(['jquery', 'underscore', 'backbone', 'plist', 'lattice', 'text!navViewMenuTemplate'],
+define(['jquery', 'underscore', 'backbone', 'plist', 'lattice', 'text!menus/templates/NavViewMenu.html'],
function($, _, Backbone, plist, lattice, template){
return Backbone.View.extend({
diff --git a/js/menus/Navbar.js b/js/menus/otherUI/Navbar.js
similarity index 100%
rename from js/menus/Navbar.js
rename to js/menus/otherUI/Navbar.js
diff --git a/js/menus/Ribbon.js b/js/menus/otherUI/Ribbon.js
similarity index 95%
rename from js/menus/Ribbon.js
rename to js/menus/otherUI/Ribbon.js
index a9223d00..6180e7b6 100644
--- a/js/menus/Ribbon.js
+++ b/js/menus/otherUI/Ribbon.js
@@ -2,7 +2,7 @@
* Created by fab on 3/18/15.
*/
-define(['jquery', 'underscore', 'backbone', 'plist', 'lattice', 'appState', 'text!ribbonTemplate'], function($, _, Backbone, plist, lattice, appState, template){
+define(['jquery', 'underscore', 'backbone', 'plist', 'lattice', 'appState', 'text!menus/templates/Ribbon.html'], function($, _, Backbone, plist, lattice, appState, template){
var Ribbon = Backbone.View.extend({
diff --git a/js/menus/ScriptView.js b/js/menus/otherUI/ScriptView.js
similarity index 100%
rename from js/menus/ScriptView.js
rename to js/menus/otherUI/ScriptView.js
--
GitLab