Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
A
AMOEBA
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Amanda Ghassaei
AMOEBA
Commits
763304be
Commit
763304be
authored
May 23, 2016
by
amandaghassaei
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
closing off parts of code that throw errors
parent
08fe0ca8
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
62 additions
and
3 deletions
+62
-3
css/main.css
css/main.css
+16
-0
index.html
index.html
+12
-0
js/menus/otherUI/ModalView.js
js/menus/otherUI/ModalView.js
+9
-3
js/menus/otherUI/Navbar.js
js/menus/otherUI/Navbar.js
+5
-0
js/menus/templates/ModalViewSmall.html
js/menus/templates/ModalViewSmall.html
+17
-0
js/simulation/EM/emSimLattice.js
js/simulation/EM/emSimLattice.js
+3
-0
No files found.
css/main.css
View file @
763304be
...
...
@@ -640,4 +640,20 @@ label {
.waveformIcon
{
margin-left
:
10px
;
width
:
40px
;
}
.modal-header
{
text-align
:
center
;
border
:
0px
;
}
.modal-content
{
-webkit-border-radius
:
0px
;
-moz-border-radius
:
0px
;
border-radius
:
0px
;
text-align
:
center
;
}
#comingSoon
,
#genericModal
{
top
:
20%
;
}
\ No newline at end of file
index.html
View file @
763304be
...
...
@@ -158,6 +158,18 @@
<div
class=
"modal fade"
id=
"genericModal"
tabindex=
"-1"
role=
"dialog"
aria-labelledby=
"basicModal"
aria-hidden=
"true"
></div>
<div
class=
"modal fade"
id=
"comingSoon"
tabindex=
"-1"
role=
"dialog"
aria-labelledby=
"basicModal"
aria-hidden=
"true"
>
<div
class=
"modal-dialog modal-sm"
>
<div
class=
"modal-content"
>
<div
class=
"modal-body"
>
This is in development,
<br/>
coming soon.
</div>
</div>
</div>
</div>
<div
id=
"console"
>
<div>
<div
id=
"consoleOutput"
></div>
...
...
js/menus/otherUI/ModalView.js
View file @
763304be
...
...
@@ -3,7 +3,8 @@
*/
define
([
'
jquery
'
,
'
underscore
'
,
'
backbone
'
,
'
text!menus/templates/ModalView.html
'
],
function
(
$
,
_
,
Backbone
,
template
){
define
([
'
jquery
'
,
'
underscore
'
,
'
backbone
'
,
'
text!menus/templates/ModalView.html
'
,
'
text!menus/templates/ModalViewSmall.html
'
],
function
(
$
,
_
,
Backbone
,
template
,
templateSmall
){
return
Backbone
.
View
.
extend
({
...
...
@@ -18,7 +19,11 @@ define(['jquery', 'underscore', 'backbone', 'text!menus/templates/ModalView.html
},
render
:
function
(
data
){
this
.
$el
.
html
(
this
.
template
(
data
));
if
(
data
.
small
){
this
.
$el
.
html
(
this
.
templateSmall
(
data
));
}
else
{
this
.
$el
.
html
(
this
.
template
(
data
));
}
this
.
$el
.
modal
(
"
show
"
);
},
...
...
@@ -30,6 +35,7 @@ define(['jquery', 'underscore', 'backbone', 'text!menus/templates/ModalView.html
// Backbone.View.prototype.remove.call(this);
},
template
:
_
.
template
(
template
)
template
:
_
.
template
(
template
),
templateSmall
:
_
.
template
(
templateSmall
)
});
});
\ No newline at end of file
js/menus/otherUI/Navbar.js
View file @
763304be
...
...
@@ -63,6 +63,11 @@ define(['jquery', 'underscore', 'backbone', 'fileSaver', 'navViewMenu', 'navHier
}
e
.
preventDefault
();
if
(
navSelection
==
"
navSim
"
){
//choose which simulation package to pull up
var
hierLevel
=
appState
.
get
(
"
hierLevel
"
);
if
(
hierLevel
==
"
element
"
||
hierLevel
==
"
module
"
||
hierLevel
==
"
system
"
){
$
(
"
#comingSoon
"
).
modal
(
"
show
"
);
return
;
}
this
.
model
.
set
(
"
currentNav
"
,
appState
.
get
(
"
materialClass
"
)
+
"
NavSim
"
);
return
;
}
else
if
(
navSelection
==
"
navDesign
"
&&
appState
.
get
(
"
currentNav
"
)
==
"
navDesign
"
){
//optionally show the design dropdown
...
...
js/menus/templates/ModalViewSmall.html
0 → 100644
View file @
763304be
<div
class=
"modal-dialog modal-sm"
>
<div
class=
"modal-content"
>
<
%
if
(
title
!=
""
){
%
>
<div
class=
"modal-header"
>
<button
type=
"button"
class=
"close"
data-dismiss=
"modal"
aria-hidden=
"true"
>
×
</button>
<p
class=
"modal-title"
><
%=
title
%
></p>
</div>
<
%
}
%
>
<div
class=
"modal-body"
>
<
%
if
(text =
=
""){
%
>
Need something here.
<
%
}
else
{
%
>
<
%=
text
%
>
<
%
}
%
>
</div>
</div>
</div>
\ No newline at end of file
js/simulation/EM/emSimLattice.js
View file @
763304be
...
...
@@ -29,6 +29,9 @@ define(['underscore', 'backbone', 'threeModel', 'lattice', 'plist', 'emWire', 'G
var
numCells
=
lattice
.
get
(
"
numCells
"
);
if
(
numCells
==
0
){
require
([
"
modalView
"
],
function
(
ModalView
){
new
ModalView
({
small
:
true
,
title
:
""
,
text
:
"
No cells in assembly.<br/>Please go back to 'Design' tab and add cells.
"
});
});
console
.
warn
(
"
no cells
"
);
return
;
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment