Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
D
DMDesign
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Amanda Ghassaei
DMDesign
Commits
a6c503ac
Commit
a6c503ac
authored
10 years ago
by
Amanda Ghassaei
Browse files
Options
Downloads
Patches
Plain Diff
all menus working
parent
a7e7b7f6
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
js/menus/MenuWrapperView.js
+7
-6
7 additions, 6 deletions
js/menus/MenuWrapperView.js
js/menus/navbar.js
+6
-1
6 additions, 1 deletion
js/menus/navbar.js
js/models/AppState.js
+1
-1
1 addition, 1 deletion
js/models/AppState.js
main.html
+3
-3
3 additions, 3 deletions
main.html
with
17 additions
and
11 deletions
js/menus/MenuWrapperView.js
+
7
−
6
View file @
a6c503ac
...
...
@@ -66,7 +66,7 @@ MenuWrapper = Backbone.View.extend({
this
.
scriptMenu
.
render
();
}
else
{
console
.
warn
(
"
no tab initialized!
"
);
$
(
"
#menuContent
"
).
html
(
''
);
//clear out content from menu
$
(
"
#menuContent
"
).
html
(
'
Something goes here eventually.
'
);
//clear out content from menu
}
},
...
...
@@ -89,9 +89,9 @@ MenuWrapper = Backbone.View.extend({
_populateAndShow
:
function
(){
this
.
$el
.
html
(
this
.
template
(
_
.
extend
(
this
.
model
.
attributes
,
{
d
esign
MenuTabs
:
this
.
designMenuTabs
,
simMenuTabs
:
this
.
simMenuTabs
,
assemMenuTabs
:
this
.
assemMenuTabs
})));
{
navD
esign
:
this
.
designMenuTabs
,
navSim
:
this
.
simMenuTabs
,
navAssemble
:
this
.
assemMenuTabs
})));
this
.
_updateCurrentTab
();
this
.
_show
();
},
...
...
@@ -116,8 +116,9 @@ MenuWrapper = Backbone.View.extend({
template
:
_
.
template
(
'
\
<ul class="nav nav-tabs nav-justified">
\
<% _.each(_.keys(designMenuTabs), function(key){%>
\
<li role="presentation" data-name="<%= key %>"><a href="#"><%= designMenuTabs[key] %></a></li>
\
<% var dict = eval(currentNav);
\
_.each(_.keys(dict), function(key){%>
\
<li role="presentation" data-name="<%= key %>"><a href="#"><%= dict[key] %></a></li>
\
<% }); %>
\
</ul>
\
'
)
...
...
This diff is collapsed.
Click to expand it.
js/menus/navbar.js
+
6
−
1
View file @
a6c503ac
...
...
@@ -49,7 +49,12 @@ NavBar = Backbone.View.extend({
$link
.
parent
().
addClass
(
"
open
"
);
//highlight
var
navSelection
=
$link
.
data
(
"
menuId
"
);
if
(
navSelection
==
"
about
"
)
return
;
if
(
navSelection
)
this
.
model
.
set
(
"
currentNav
"
,
navSelection
);
if
(
navSelection
)
{
if
(
navSelection
==
"
navDesign
"
)
this
.
model
.
set
(
"
currentTab
"
,
"
lattice
"
,
{
silent
:
true
});
else
if
(
navSelection
==
"
navSim
"
)
this
.
model
.
set
(
"
currentTab
"
,
"
physics
"
,
{
silent
:
true
});
else
if
(
navSelection
==
"
navAssemble
"
)
this
.
model
.
set
(
"
currentTab
"
,
"
assembler
"
,
{
silent
:
true
});
this
.
model
.
set
(
"
currentNav
"
,
navSelection
);
}
},
_uiStuff
:
function
(){
...
...
This diff is collapsed.
Click to expand it.
js/models/AppState.js
+
1
−
1
View file @
a6c503ac
...
...
@@ -8,7 +8,7 @@
AppState
=
Backbone
.
Model
.
extend
({
defaults
:
{
currentNav
:
"
d
esign
"
,
//design, sim, assemble
currentNav
:
"
navD
esign
"
,
//design, sim, assemble
currentTab
:
"
lattice
"
,
menuIsVisible
:
true
},
...
...
This diff is collapsed.
Click to expand it.
main.html
+
3
−
3
View file @
a6c503ac
...
...
@@ -80,9 +80,9 @@
</div>
<div
class=
"collapse navbar-collapse"
id=
"navbar-collapse-01"
>
<ul
class=
"nav navbar-nav navbar-left"
>
<li><a
data-menu-id=
"
d
esign"
class=
"menuHoverControls"
href=
"#"
>
Design
</a></li>
<li><a
data-menu-id=
"
s
im"
class=
"menuHoverControls"
href=
"#"
>
Simulate
</a></li>
<li><a
data-menu-id=
"
a
ssemble"
class=
"menuHoverControls"
href=
"#"
>
Assemble
</a></li>
<li><a
data-menu-id=
"
navD
esign"
class=
"menuHoverControls"
href=
"#"
>
Design
</a></li>
<li><a
data-menu-id=
"
navS
im"
class=
"menuHoverControls"
href=
"#"
>
Simulate
</a></li>
<li><a
data-menu-id=
"
navA
ssemble"
class=
"menuHoverControls"
href=
"#"
>
Assemble
</a></li>
<li
class=
"dropdown navDropdown"
>
<a
href=
"#"
class=
"dropdown-toggle"
data-toggle=
"dropdown"
>
Export
<b
class=
"caret"
></b></a>
<span
class=
"dropdown-arrow"
></span>
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment