Commit 1493953f authored by Leigh B Stoller's avatar Leigh B Stoller

Show the profile description for selected profile. Fix Date bug.

parent b015d168
...@@ -191,6 +191,8 @@ function SPITFORM($formfields, $newuser, $errors) ...@@ -191,6 +191,8 @@ function SPITFORM($formfields, $newuser, $errors)
" </label>\n"; " </label>\n";
} }
echo " </div>\n"; echo " </div>\n";
echo " <span class=''
id='selected_profile_description'></span>\n";
echo "</fieldset> echo "</fieldset>
<button class='btn btn-success pull-right' <button class='btn btn-success pull-right'
type='submit' name='create'>Create! type='submit' name='create'>Create!
......
...@@ -128,7 +128,7 @@ function ShowTopo(uuid) ...@@ -128,7 +128,7 @@ function ShowTopo(uuid)
var xml = $(xmlDoc); var xml = $(xmlDoc);
var topo = ConvertManifestToJSON(null, xml); var topo = ConvertManifestToJSON(null, xml);
console.log(json.value); console.info(json.value);
// Deal with the instructions. // Deal with the instructions.
$(xml).find("rspec_tour").each(function() { $(xml).find("rspec_tour").each(function() {
...@@ -137,11 +137,10 @@ function ShowTopo(uuid) ...@@ -137,11 +137,10 @@ function ShowTopo(uuid)
marked.setOptions({"sanitize" : true}); marked.setOptions({"sanitize" : true});
var text = $(this).text(); var text = $(this).text();
console.log(text); // Stick the text in
$('#instructions_text').html(marked(text));
// Make the div visible. // Make the div visible.
$('#instructions_panel').removeClass("invisible"); $('#instructions_panel').removeClass("invisible");
// And stick the text in
$('#instructions_text').html(marked(text));
}); });
}); });
...@@ -219,6 +218,7 @@ function ShowProfileList(selectedElement) ...@@ -219,6 +218,7 @@ function ShowProfileList(selectedElement)
} }
} }
$('#showtopo_description').html(description); $('#showtopo_description').html(description);
$('#selected_profile_description').html(description);
maketopmap("#showtopo_div", maketopmap("#showtopo_div",
($("#showtopo_div").outerWidth()), ($("#showtopo_div").outerWidth()),
...@@ -524,8 +524,6 @@ function StartResizeWatchdog(uuid) ...@@ -524,8 +524,6 @@ function StartResizeWatchdog(uuid)
// //
function StartCountdownClock(when) function StartCountdownClock(when)
{ {
console.info(when);
// Use this static variable to force clock reset. // Use this static variable to force clock reset.
StartCountdownClock.reset = when; StartCountdownClock.reset = when;
...@@ -540,7 +538,6 @@ function StartCountdownClock(when) ...@@ -540,7 +538,6 @@ function StartCountdownClock(when)
// Need the timezone offset to format a local time. // Need the timezone offset to format a local time.
var timeOffsetInHours = (new Date().getTimezoneOffset()/60) * (-1); var timeOffsetInHours = (new Date().getTimezoneOffset()/60) * (-1);
console.info(timeOffsetInHours);
// variables for time units // variables for time units
var days, hours, minutes, seconds; var days, hours, minutes, seconds;
...@@ -564,7 +561,7 @@ function StartCountdownClock(when) ...@@ -564,7 +561,7 @@ function StartCountdownClock(when)
// Reformat in local time and show the user. // Reformat in local time and show the user.
var local_date = new Date(when); 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); $("#quickvm_expires").html(local_string);
// Countdown also based on local time. // Countdown also based on local time.
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment