etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of ssh://git.cloud.com/var/lib/git/cloudstack-oss

This commit is contained in:
Jessica Wang 2010-10-28 14:18:49 -07:00
parent 77b4eec14d ff26080cb0
commit a40fdf158b
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ui/new/index.jsp
View File

@ -677,7 +677,7 @@ long milliseconds = new Date().getTime();
<!-- Left Menu ends here-->
</div>
<div id="footer">
<div class="footer_testprovisiongtool">
<div class="footer_testprovisiongtool" id="launch_test" style="display:none">
<div class="footer_testprovisiongtool_icon"></div>
<a href="#">Launch Test Provisioning Tool</a>
</div>

12
ui/new/scripts/cloud.core2.init.js
View File

@ -181,9 +181,7 @@ $(document).ready(function() {
return false;
});
/*
initializeTestTool();
*/
// Default AJAX Setup
$.ajaxSetup({
@ -357,6 +355,11 @@ $(document).ready(function() {
$("#main_username").text(g_username);
$("#login_wrapper").hide();
if (isAdmin()) {
$("#launch_test").show();
} else {
$("#launch_test").hide();
}
$("#main").show();
$("#leftmenu_dashboard").click();
},
@ -436,6 +439,11 @@ $(document).ready(function() {
buildSecondLevelNavigation();
$("#main_username").text(g_username);
$("#leftmenu_dashboard").click();
if (isAdmin()) {
$("#launch_test").show();
} else {
$("#launch_test").hide();
}
$("#main").show();
},
error: function(xmlHTTP) {