Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emulab
emulab-devel
Commits
1493953f
Commit
1493953f
authored
Feb 27, 2014
by
Leigh B Stoller
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Show the profile description for selected profile. Fix Date bug.
parent
b015d168
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
8 deletions
+7
-8
www/aptui/instantiate.php
www/aptui/instantiate.php
+2
-0
www/aptui/js/quickvm_sup.js
www/aptui/js/quickvm_sup.js
+5
-8
No files found.
www/aptui/instantiate.php
View file @
1493953f
...
...
@@ -191,6 +191,8 @@ function SPITFORM($formfields, $newuser, $errors)
" </label>
\n
"
;
}
echo
" </div>
\n
"
;
echo
" <span class=''
id='selected_profile_description'></span>
\n
"
;
echo
"</fieldset>
<button class='btn btn-success pull-right'
type='submit' name='create'>Create!
...
...
www/aptui/js/quickvm_sup.js
View file @
1493953f
...
...
@@ -128,7 +128,7 @@ function ShowTopo(uuid)
var
xml
=
$
(
xmlDoc
);
var
topo
=
ConvertManifestToJSON
(
null
,
xml
);
console
.
log
(
json
.
value
);
console
.
info
(
json
.
value
);
// Deal with the instructions.
$
(
xml
).
find
(
"
rspec_tour
"
).
each
(
function
()
{
...
...
@@ -137,11 +137,10 @@ function ShowTopo(uuid)
marked
.
setOptions
({
"
sanitize
"
:
true
});
var
text
=
$
(
this
).
text
();
console
.
log
(
text
);
// Stick the text in
$
(
'
#instructions_text
'
).
html
(
marked
(
text
));
// Make the div visible.
$
(
'
#instructions_panel
'
).
removeClass
(
"
invisible
"
);
// And stick the text in
$
(
'
#instructions_text
'
).
html
(
marked
(
text
));
});
});
...
...
@@ -219,6 +218,7 @@ function ShowProfileList(selectedElement)
}
}
$
(
'
#showtopo_description
'
).
html
(
description
);
$
(
'
#selected_profile_description
'
).
html
(
description
);
maketopmap
(
"
#showtopo_div
"
,
(
$
(
"
#showtopo_div
"
).
outerWidth
()),
...
...
@@ -524,8 +524,6 @@ function StartResizeWatchdog(uuid)
//
function
StartCountdownClock
(
when
)
{
console
.
info
(
when
);
// Use this static variable to force clock reset.
StartCountdownClock
.
reset
=
when
;
...
...
@@ -540,7 +538,6 @@ function StartCountdownClock(when)
// Need the timezone offset to format a local time.
var
timeOffsetInHours
=
(
new
Date
().
getTimezoneOffset
()
/
60
)
*
(
-
1
);
console
.
info
(
timeOffsetInHours
);
// variables for time units
var
days
,
hours
,
minutes
,
seconds
;
...
...
@@ -564,7 +561,7 @@ function StartCountdownClock(when)
// Reformat in local time and show the user.
var
local_date
=
new
Date
(
when
);
var
local_string
=
local_date
.
format
(
"
yyyy-mm-dd
hh
:MM:ss Z
"
);
var
local_string
=
local_date
.
format
(
"
yyyy-mm-dd
HH
:MM:ss Z
"
);
$
(
"
#quickvm_expires
"
).
html
(
local_string
);
// Countdown also based on local time.
...
...
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