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
254599d1
Commit
254599d1
authored
May 06, 2016
by
Kirk Webb
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
More changes for PhantomNet GENI login missed in the last commit.
parent
6f9e7ef0
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
4 deletions
+4
-4
www/aptui/js/common.js
www/aptui/js/common.js
+1
-1
www/aptui/js/login.js
www/aptui/js/login.js
+1
-1
www/aptui/quickvm_sup.php
www/aptui/quickvm_sup.php
+2
-2
No files found.
www/aptui/js/common.js
View file @
254599d1
...
...
@@ -94,7 +94,7 @@ window.APT_OPTIONS.initialize = function (sup)
$
(
'
#loginbutton
'
).
click
(
function
(
event
)
{
event
.
preventDefault
();
sup
.
ShowModal
(
'
#quickvm_login_modal
'
);
if
(
window
.
ISCLOUD
)
{
if
(
window
.
ISCLOUD
||
window
.
ISPNET
)
{
console
.
info
(
"
Loading geni auth code
"
);
sup
.
InitGeniLogin
(
embedded
);
require
([
geniauth
],
function
()
{
...
...
www/aptui/js/login.js
View file @
254599d1
...
...
@@ -14,7 +14,7 @@ function (_, sup, waitwaitString)
// We share code with the modal version of login, and the
// handler for the button is installed in initialize().
// See comment there.
if
(
window
.
ISCLOUD
)
{
if
(
window
.
ISCLOUD
||
window
.
ISPNET
)
{
sup
.
InitGeniLogin
(
embedded
);
}
window
.
APT_OPTIONS
.
initialize
(
sup
);
...
...
www/aptui/quickvm_sup.php
View file @
254599d1
...
...
@@ -508,7 +508,7 @@ function SpitVerifyModal($id, $label)
function
SpitLoginModal
(
$id
)
{
global
$PORTAL_PASSWORD_HELP
;
global
$APTTITLE
,
$ISCLOUD
;
global
$APTTITLE
,
$ISCLOUD
,
$ISPNET
;
$referrer
=
CleanString
(
$_SERVER
[
'REQUEST_URI'
]);
?>
<!-- This is the login modal -->
...
...
@@ -547,7 +547,7 @@ function SpitLoginModal($id)
<div
class=
'form-group'
>
<div
class=
'col-sm-offset-2 col-sm-10'
>
<?php
if
(
$ISCLOUD
)
{
if
(
$ISCLOUD
||
$ISPNET
)
{
?>
<button
class=
'btn btn-info btn-sm pull-left'
disabled
type=
'button'
...
...
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