Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emulab
emulab-devel
Commits
98415652
Commit
98415652
authored
Jan 28, 2015
by
Leigh B Stoller
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Minor fix to embedding.
parent
7aefdaa1
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
3 deletions
+6
-3
www/aptui/geni-login.ajax
www/aptui/geni-login.ajax
+1
-1
www/aptui/js/login.js
www/aptui/js/login.js
+4
-2
www/aptui/login.php
www/aptui/login.php
+1
-0
No files found.
www/aptui/geni-login.ajax
View file @
98415652
...
...
@@ -246,7 +246,7 @@ function Do_VerifySpeaksfor()
return
;
}
if
(
isset
(
$ajax_args
[
"embedded"
]))
{
$embedded
=
1
;
$embedded
=
$ajax_args
[
"embedded"
]
;
}
#
...
...
www/aptui/js/login.js
View file @
98415652
require
(
window
.
APT_OPTIONS
.
configObject
,
[
'
underscore
'
,
'
js/quickvm_sup
'
],
function
(
_
,
sup
)
[
'
underscore
'
,
'
js/quickvm_sup
'
,
'
js/lib/text!template/waitwait-modal.html
'
],
function
(
_
,
sup
,
waitwaitString
)
{
'
use strict
'
;
var
embedded
=
0
;
...
...
@@ -8,6 +9,7 @@ function (_, sup)
function
initialize
()
{
embedded
=
window
.
EMBEDDED
;
$
(
'
#waitwait_div
'
).
html
(
waitwaitString
);
// We share code with the modal version of login, and the
// handler for the button is installed in initialize().
...
...
www/aptui/login.php
View file @
98415652
...
...
@@ -199,6 +199,7 @@ function SPITFORM($uid, $referrer, $error)
src='https://www.emulab.net/protogeni/speaks-for/geni-auth.js'>
</script>
\n
"
;
}
echo
"<div id='waitwait_div'></div>
\n
"
;
echo
"<script src='js/lib/jquery-2.0.3.min.js'></script>
\n
"
;
echo
"<script src='js/lib/bootstrap.js'></script>
\n
"
;
echo
"<script src='js/lib/require.js' data-main='js/login'></script>"
;
...
...
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