Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
emulab
emulab-devel
Commits
46d6377d
Commit
46d6377d
authored
May 28, 2014
by
Jonathon Duerig
Browse files
Set require options in a way more friendly to embedding. Various fixes for resize/jacks embed.
parent
36550e66
Changes
10
Hide whitespace changes
Inline
Side-by-side
www/aptui/css/quickvm.css
View file @
46d6377d
...
...
@@ -133,6 +133,10 @@ body {
border
:
1px
solid
#000
;
}
#showtopo_div
{
height
:
300px
;
}
@media
(
min-width
:
970px
)
{
#showtopo_dialog
{
...
...
@@ -145,7 +149,6 @@ body {
#showtopo_div
{
width
:
643px
;
height
:
300px
;
}
#showtopo_nopicker
{
width
:
850px
;
...
...
www/aptui/js/common.js
View file @
46d6377d
window
.
APT_OPTIONS
=
window
.
APT_OPTIONS
||
{};
window
.
APT_OPTIONS
.
config
=
function
()
{
require
.
config
({
baseUrl
:
'
.
'
,
paths
:
{
'
jquery-ui
'
:
'
js/lib/jquery-ui-1.10.4.custom
'
,
'
jquery-grid
'
:
'
js/lib/jquery.appendGrid-1.3.1.min
'
,
'
formhelpers
'
:
'
js/lib/bootstrap-formhelpers
'
,
'
dateformat
'
:
'
js/lib/date.format
'
,
'
d3
'
:
'
js/lib/d3.v3
'
,
'
filestyle
'
:
'
js/lib/filestyle
'
,
'
tablesorter
'
:
'
js/lib/jquery.tablesorter.min
'
,
'
tablesorterwidgets
'
:
'
js/lib/jquery.tablesorter.widgets.min
'
,
'
marked
'
:
'
js/lib/marked
'
,
'
moment
'
:
'
js/lib/moment
'
,
'
underscore
'
:
'
js/lib/underscore-min
'
,
'
filesize
'
:
'
js/lib/filesize.min
'
,
'
jacks
'
:
'
https://www.emulab.net/protogeni/jacks-stable/js/jacks
'
},
shim
:
{
'
jquery-ui
'
:
{
},
'
jquery-grid
'
:
{
deps
:
[
'
jquery-ui
'
]
},
'
formhelpers
'
:
{
},
'
dateformat
'
:
{
exports
:
'
dateFormat
'
},
'
d3
'
:
{
exports
:
'
d3
'
},
'
filestyle
'
:
{
},
'
tablesorter
'
:
{
},
'
tablesorterwidgets
'
:
{
deps
:
[
'
tablesorter
'
]
},
'
marked
'
:
{
exports
:
'
marked
'
},
'
underscore
'
:
{
exports
:
'
_
'
},
'
filesize
'
:
{
exports
:
'
filesize
'
},
},
});
window
.
APT_OPTIONS
.
configObject
=
{
baseUrl
:
'
.
'
,
paths
:
{
'
jquery-ui
'
:
'
js/lib/jquery-ui-1.10.4.custom
'
,
'
jquery-grid
'
:
'
js/lib/jquery.appendGrid-1.3.1.min
'
,
'
formhelpers
'
:
'
js/lib/bootstrap-formhelpers
'
,
'
dateformat
'
:
'
js/lib/date.format
'
,
'
d3
'
:
'
js/lib/d3.v3
'
,
'
filestyle
'
:
'
js/lib/filestyle
'
,
'
tablesorter
'
:
'
js/lib/jquery.tablesorter.min
'
,
'
tablesorterwidgets
'
:
'
js/lib/jquery.tablesorter.widgets.min
'
,
'
marked
'
:
'
js/lib/marked
'
,
'
moment
'
:
'
js/lib/moment
'
,
'
underscore
'
:
'
js/lib/underscore-min
'
,
'
filesize
'
:
'
js/lib/filesize.min
'
,
'
jacks
'
:
'
https://www.emulab.net/protogeni/jacks-devel/js/jacks
'
},
shim
:
{
'
jquery-ui
'
:
{
},
'
jquery-grid
'
:
{
deps
:
[
'
jquery-ui
'
]
},
'
formhelpers
'
:
{
},
'
dateformat
'
:
{
exports
:
'
dateFormat
'
},
'
d3
'
:
{
exports
:
'
d3
'
},
'
filestyle
'
:
{
},
'
tablesorter
'
:
{
},
'
tablesorterwidgets
'
:
{
deps
:
[
'
tablesorter
'
]
},
'
marked
'
:
{
exports
:
'
marked
'
},
'
underscore
'
:
{
exports
:
'
_
'
},
'
filesize
'
:
{
exports
:
'
filesize
'
}
}
};
window
.
APT_OPTIONS
.
initialize
=
function
(
sup
)
...
...
www/aptui/js/instantiate.js
View file @
46d6377d
window
.
APT_OPTIONS
.
config
();
//
window.APT_OPTIONS.config();
require
([
'
underscore
'
,
'
js/quickvm_sup
'
,
// jQuery modules
require
(
window
.
APT_OPTIONS
.
configObject
,
[
'
underscore
'
,
'
js/quickvm_sup
'
,
// jQuery modules
'
formhelpers
'
,
'
filestyle
'
,
'
marked
'
,
'
jacks
'
],
function
(
_
,
sup
)
{
...
...
@@ -125,7 +126,7 @@ function (_, sup)
mode
:
'
viewer
'
,
source
:
'
rspec
'
,
root
:
'
#showtopo_div
'
,
size
:
{
x
:
643
,
y
:
300
},
//
size: { x: 643, y: 300 },
nodeSelect
:
false
,
readyCallback
:
function
(
input
,
output
)
{
jacksUpdate
=
input
;
...
...
www/aptui/js/main.js
View file @
46d6377d
window
.
APT_OPTIONS
.
config
();
require
([
'
js/quickvm_sup
'
require
(
window
.
APT_OPTIONS
.
configObject
,
[
'
js/quickvm_sup
'
// jQuery modules
],
function
(
sup
)
...
...
www/aptui/js/manage_profile.js
View file @
46d6377d
window
.
APT_OPTIONS
.
config
();
require
([
'
underscore
'
,
'
js/quickvm_sup
'
,
'
filesize
'
,
'
js/image
'
,
require
(
window
.
APT_OPTIONS
.
configObject
,
[
'
underscore
'
,
'
js/quickvm_sup
'
,
'
filesize
'
,
'
js/image
'
,
'
js/lib/text!template/manage-profile.html
'
,
'
js/lib/text!template/waitwait-modal.html
'
,
'
js/lib/text!template/renderer-modal.html
'
,
...
...
www/aptui/js/myexperiments.js
View file @
46d6377d
window
.
APT_OPTIONS
.
config
();
require
([
'
js/quickvm_sup
'
,
require
(
window
.
APT_OPTIONS
.
configObject
,
[
'
js/quickvm_sup
'
,
'
tablesorter
'
,
'
tablesorterwidgets
'
],
function
(
sup
)
{
...
...
www/aptui/js/myprofiles.js
View file @
46d6377d
window
.
APT_OPTIONS
.
config
();
require
([
'
js/quickvm_sup
'
,
require
(
window
.
APT_OPTIONS
.
configObject
,
[
'
js/quickvm_sup
'
,
'
tablesorter
'
,
'
tablesorterwidgets
'
],
function
(
sup
)
{
...
...
www/aptui/js/null.js
View file @
46d6377d
window
.
APT_OPTIONS
.
config
();
require
([
'
js/quickvm_sup
'
],
require
(
window
.
APT_OPTIONS
.
configObject
,
[
'
js/quickvm_sup
'
],
function
(
sup
)
{
'
use strict
'
;
...
...
www/aptui/js/signup.js
View file @
46d6377d
window
.
APT_OPTIONS
.
config
();
require
([
'
underscore
'
,
'
js/quickvm_sup
'
,
require
(
window
.
APT_OPTIONS
.
configObject
,
[
'
underscore
'
,
'
js/quickvm_sup
'
,
'
js/lib/text!template/about-account.html
'
,
'
js/lib/text!template/verify-modal.html
'
,
'
js/lib/text!template/signup-personal.html
'
,
...
...
www/aptui/js/status.js
View file @
46d6377d
window
.
APT_OPTIONS
.
config
();
require
([
'
underscore
'
,
'
js/quickvm_sup
'
,
'
moment
'
,
'
js/image
'
,
require
([
window
.
APT_OPTIONS
.
configObject
,
'
underscore
'
,
'
js/quickvm_sup
'
,
'
moment
'
,
'
js/image
'
,
'
js/lib/text!template/status.html
'
,
'
js/lib/text!template/waitwait-modal.html
'
,
'
js/lib/text!template/oops-modal.html
'
,
...
...
Write
Preview
Supports
Markdown
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