diff --git a/ui/new/scripts/cloud.core2.init.js b/ui/new/scripts/cloud.core2.init.js
index 59a2888ec73..4927a2a57ac 100644
--- a/ui/new/scripts/cloud.core2.init.js
+++ b/ui/new/scripts/cloud.core2.init.js
@@ -192,13 +192,7 @@ $(document).ready(function() {
/*
initializeTestTool();
*/
-
- // We will be dropping all the main tab content into this container
- mainContainer = $("#maincontentarea");
-
- // Tab Links, dashboard is the initial active tab
- mainContainer.load("content/tab_dashboard.html");
-
+
// Default AJAX Setup
$.ajaxSetup({
url: "/client/api",
@@ -279,8 +273,7 @@ $(document).ready(function() {
$("#account_password").val("");
$(".loginbutton_box p").hide();
$("#logoutpage").show();
- $("body").css("background", "#4e4e4e url(images/logout_bg.gif) repeat-x top left");
- mainContainer.empty();
+ $("body").css("background", "#4e4e4e url(images/logout_bg.gif) repeat-x top left");
$("#mainmaster").hide();
$("#overlay_black").hide();
@@ -441,485 +434,7 @@ $(document).ready(function() {
zIndex: 2000,
buttons: { "OK": function() { $(this).dialog("close"); } }
});
-
- /*
- $("#dialog_server_error").dialog({
- autoOpen: false,
- modal: true,
- zIndex: 2000,
- buttons: { "OK": function() { $(this).dialog("close"); } }
- });
- $("#dialog_server_error").siblings(".ui-widget-header").css("background", "url('/client/css/images/ui-bg_errorglass_30_ffffff_1x400.png') repeat-x scroll 50% 50% #393939");
- $("#dialog_server_error").siblings(".ui-dialog-buttonpane").find(".ui-state-default").css("background", "url('/client/css/images/ui-bg_errorglass_30_ffffff_1x400.png') repeat-x scroll 50% 50% #393939");
- */
-
- // Menu Tabs
- $("#global_nav").bind("click", function(event) {
- var tab = $(event.target);
- var tabId = tab.attr("id");
- var menuOnClass = "menutab_on";
- var menuOffClass = "menutab_off";
- if (tabId == "menutab_dashboard_user" || tabId == "menutab_dashboard_root" || tabId == "menutab_dashboard_domain") {
- showDashboardTab();
- } else if (tabId == "menutab_vm") {
- mainContainer.load("content/tab_instances.html", function() {
- showInstancesTab(tab.data("domainId"), tab.data("account"));
- });
- } else if (tabId == "menutab_networking") {
- mainContainer.load("content/tab_networking.html", function() {
- showNetworkingTab(tab.data("domainId"), tab.data("account"));
- });
- } else if (tabId == "menutab_templates") {
- mainContainer.load("content/tab_templates.html", function() {
- showTemplatesTab();
- });
- } else if (tabId == "menutab_events") {
- mainContainer.load("content/tab_events.html", function() {
- showEventsTab(tab.data("showEvents"));
- });
- } else if (tabId == "menutab_hosts") {
- mainContainer.load("content/tab_hosts.html", function() {
- showHostsTab();
- });
- } else if (tabId == "menutab_storage") {
- mainContainer.load("content/tab_storage.html", function() {
- showStorageTab(tab.data("domainId"), tab.data("targetTab"));
- });
- } else if (tabId == "menutab_accounts") {
- mainContainer.load("content/tab_accounts.html", function() {
- showAccountsTab(tab.data("domainId"));
- });
- } else if (tabId == "menutab_domain") {
- mainContainer.load("jsp/tab_domains.jsp", function() {
- showDomainsTab();
- });
- } else if (tabId == "menutab_configuration") {
- mainContainer.load("content/tab_configuration.html", function() {
- showConfigurationTab();
- });
- } else {
- return false;
- }
-
- if (isAdmin() || isDomainAdmin()) {
- menuOnClass = "admin_menutab_on";
- menuOffClass = "admin_menutab_off";
- } else if (isUser()) {
- menuOnClass = "menutab_on";
- menuOffClass = "menutab_off";
- }
- if (activeTab != null) {
- activeTab.removeClass(menuOnClass).addClass(menuOffClass);
- }
- tab.removeClass(menuOffClass).addClass(menuOnClass);
- activeTab = tab;
- removeDialogs();
- return false;
- });
-
- // Dashboard Tab
- function showDashboardTab() {
- mainContainer.load("content/tab_dashboard.html", function() {
- $(".header_topright #header_username").text($.cookie("username"));
- if (isAdmin()) {
- var sessionExpired = false;
- var zones = null;
- var noZones = false;
- var noPods = true;
- $("#menutab_dashboard_root, #menutab_vm, #menutab_networking_old, #menutab_networking, #menutab_templates, #menutab_events, #menutab_hosts, #menutab_storage, #menutab_accounts, #menutab_domain").hide();
- $.ajax({
- data: createURL("command=listZones&available=true&response=json"+maxPageSize),
- dataType: "json",
- async: false,
- success: function(json) {
- zones = json.listzonesresponse.zone;
- var zoneSelect = $("#capacity_zone_select").empty();
- if (zones != null && zones.length > 0) {
- for (var i = 0; i < zones.length; i++) {
- zoneSelect.append("");
- if(noPods) {
- $.ajax({
- data: createURL("command=listPods&zoneId="+zones[i].id+"&response=json"),
- dataType: "json",
- async: false,
- success: function(json) {
- var pods = json.listpodsresponse.pod;
- if (pods != null && pods.length > 0) {
- noPods = false;
- $("#menutab_dashboard_root, #menutab_vm, #menutab_networking_old, #menutab_networking, #menutab_templates, #menutab_events, #menutab_hosts, #menutab_storage, #menutab_accounts, #menutab_domain").show();
- }
- }
- });
- }
- }
- } else {
- noZones = true;
- }
- },
- beforeSend: function(XMLHttpRequest) {
- return true;
- }
- });
- if (sessionExpired) return false;
- if (noZones || noPods) {
- $("#tab_dashboard_user").hide();
- $("#menutab_role_user").hide();
- $("#menutab_role_root").show();
- $("#menutab_configuration").click();
- return false;
- }
-
- var capacities = null;
- $.ajax({
- cache: false,
- async: false,
- data: createURL("command=listCapacity&response=json"),
- dataType: "json",
- success: function(json) {
- capacities = json.listcapacityresponse.capacity;
- }
- });
-
- $("#capacity_pod_select").bind("change", function(event) {
- // Reset to Defaults
- $("#public_ip_total, #storage_total, #storage_alloc_total, #sec_storage_total, #memory_total, #cpu_total, #private_ip_total").text("N/A");
- $("#public_ip_used, #storage_used, #storage_alloc, #sec_storage_used, #memory_used, #cpu_used, #private_ip_used,").attr("style", "width:50%").text("N/A");
- $(".db_bargraph_barbox_safezone").attr("style", "width:0%");
- $(".db_bargraph_barbox_unsafezone").attr("style", "width:0%");
-
- var selectedZone = $("#capacity_zone_select option:selected").text();
- var selectedPod = $("#capacity_pod_select").val();
-
- if (capacities != null && capacities.length > 0) {
- for (var i = 0; i < capacities.length; i++) {
- var capacity = capacities[i];
- if (capacity.zonename == selectedZone) {
- // Public IPs
- if (capacity.type == "4") {
- $("#public_ip_used").attr("style", "width: " + ((parseFloat(capacity.percentused) < 50) ? "50%" : capacity.percentused + "%")).text("Used: " + capacity.capacityused + " / " + capacity.percentused + "%");
- $("#public_ip_total").text("Total: " + capacity.capacitytotal);
- var usedPercentage = parseInt(capacity.percentused);
- if (usedPercentage > 70) {
- $("#capacity_public_ip .db_bargraph_barbox_safezone").attr("style", "width:70%");
- if(usedPercentage <= 100)
- $("#capacity_public_ip .db_bargraph_barbox_unsafezone").attr("style", "width:"+(usedPercentage - 70)+"%");
- else
- $("#capacity_public_ip .db_bargraph_barbox_unsafezone").attr("style", "width:30%");
- } else {
- $("#capacity_public_ip .db_bargraph_barbox_safezone").attr("style", "width:"+usedPercentage+"%");
- $("#capacity_public_ip .db_bargraph_barbox_unsafezone").attr("style", "width:0%");
- }
- // Secondary Storage
- } else if (capacity.type == "6") {
- $("#sec_storage_used").attr("style", "width: " + ((parseFloat(capacity.percentused) < 50) ? "50%" : capacity.percentused + "%")).text("Used: " + convertBytes(parseInt(capacity.capacityused)) + " / " + capacity.percentused + "%");
- $("#sec_storage_total").text("Total: " + convertBytes(parseInt(capacity.capacitytotal)));
- var usedPercentage = parseInt(capacity.percentused);
- if (usedPercentage > 70) {
- $("#capacity_sec_storage .db_bargraph_barbox_safezone").attr("style", "width:70%");
- if(usedPercentage <= 100)
- $("#capacity_sec_storage .db_bargraph_barbox_unsafezone").attr("style", "width:"+(usedPercentage - 70)+"%");
- else
- $("#capacity_sec_storage .db_bargraph_barbox_unsafezone").attr("style", "width:30%");
- } else {
- $("#capacity_sec_storage .db_bargraph_barbox_safezone").attr("style", "width:"+usedPercentage+"%");
- $("#capacity_sec_storage .db_bargraph_barbox_unsafezone").attr("style", "width:0%");
- }
- } else {
- if (capacity.podname == selectedPod) {
- // Memory
- if (capacity.type == "0") {
- $("#memory_used").attr("style", "width: " + ((parseFloat(capacity.percentused) < 50) ? "50%" : capacity.percentused + "%")).text("Used: " + convertBytes(parseInt(capacity.capacityused)) + " / " + capacity.percentused + "%");
- $("#memory_total").text("Total: " + convertBytes(parseInt(capacity.capacitytotal)));
- var usedPercentage = parseInt(capacity.percentused);
- if (usedPercentage > 70) {
- $("#capacity_memory .db_bargraph_barbox_safezone").attr("style", "width:70%");
- if(usedPercentage <= 100)
- $("#capacity_memory .db_bargraph_barbox_unsafezone").attr("style", "width:"+(usedPercentage - 70)+"%");
- else
- $("#capacity_memory .db_bargraph_barbox_unsafezone").attr("style", "width:30%");
- } else {
- $("#capacity_memory .db_bargraph_barbox_safezone").attr("style", "width:"+usedPercentage+"%");
- $("#capacity_memory .db_bargraph_barbox_unsafezone").attr("style", "width:0%");
- }
- // CPU
- } else if (capacity.type == "1") {
- $("#cpu_used").attr("style", "width: " + ((parseFloat(capacity.percentused) < 50) ? "50%" : capacity.percentused + "%")).text("Used: " + convertHz(parseInt(capacity.capacityused)) + " / " + capacity.percentused + "%");
- $("#cpu_total").text("Total: " + convertHz(parseInt(capacity.capacitytotal)));
- var usedPercentage = parseInt(capacity.percentused);
- if (usedPercentage > 70) {
- $("#capacity_cpu .db_bargraph_barbox_safezone").attr("style", "width:70%");
- if(usedPercentage <= 100)
- $("#capacity_cpu .db_bargraph_barbox_unsafezone").attr("style", "width:"+(usedPercentage - 70)+"%");
- else
- $("#capacity_cpu .db_bargraph_barbox_unsafezone").attr("style", "width:30%");
- } else {
- $("#capacity_cpu .db_bargraph_barbox_safezone").attr("style", "width:"+usedPercentage+"%");
- $("#capacity_cpu .db_bargraph_barbox_unsafezone").attr("style", "width:0%");
- }
- // Storage Used
- } else if (capacity.type == "2") {
- $("#storage_used").attr("style", "width: " + ((parseFloat(capacity.percentused) < 50) ? "50%" : capacity.percentused + "%")).text("Used: " + convertBytes(parseInt(capacity.capacityused)) + " / " + capacity.percentused + "%");
- $("#storage_total").text("Total: " + convertBytes(parseInt(capacity.capacitytotal)));
- var usedPercentage = parseInt(capacity.percentused);
- if (usedPercentage > 70) {
- $("#capacity_storage .db_bargraph_barbox_safezone").attr("style", "width:70%");
- if(usedPercentage <= 100)
- $("#capacity_storage .db_bargraph_barbox_unsafezone").attr("style", "width:"+(usedPercentage - 70)+"%");
- else
- $("#capacity_storage .db_bargraph_barbox_unsafezone").attr("style", "width:30%");
- } else {
- $("#capacity_storage .db_bargraph_barbox_safezone").attr("style", "width:"+usedPercentage+"%");
- $("#capacity_storage .db_bargraph_barbox_unsafezone").attr("style", "width:0%");
- }
- // Storage Allocated
- } else if (capacity.type == "3") {
- $("#storage_alloc").attr("style", "width: " + ((parseFloat(capacity.percentused) < 50) ? "50%" : capacity.percentused + "%")).text("Used: " + convertBytes(parseInt(capacity.capacityused)) + " / " + capacity.percentused + "%");
- $("#storage_alloc_total").text("Total: " + convertBytes(parseInt(capacity.capacitytotal)));
- var usedPercentage = parseInt(capacity.percentused);
- if (usedPercentage > 70) {
- $("#capacity_storage_alloc .db_bargraph_barbox_safezone").attr("style", "width:70%");
- if(usedPercentage <= 100)
- $("#capacity_storage_alloc .db_bargraph_barbox_unsafezone").attr("style", "width:"+(usedPercentage - 70)+"%");
- else
- $("#capacity_storage_alloc .db_bargraph_barbox_unsafezone").attr("style", "width:30%");
- } else {
- $("#capacity_storage_alloc .db_bargraph_barbox_safezone").attr("style", "width:"+usedPercentage+"%");
- $("#capacity_storage_alloc .db_bargraph_barbox_unsafezone").attr("style", "width:0%");
- }
- // Private IPs
- } else if (capacity.type == "5") {
- $("#private_ip_used").attr("style", "width: " + ((parseFloat(capacity.percentused) < 50) ? "50%" : capacity.percentused + "%")).text("Used: " + capacity.capacityused + " / " + capacity.percentused + "%");
- $("#private_ip_total").text("Total: " + capacity.capacitytotal);
- var usedPercentage = parseInt(capacity.percentused);
- if (usedPercentage > 70) {
- $("#capacity_private_ip .db_bargraph_barbox_safezone").attr("style", "width:70%");
- if(usedPercentage <= 100)
- $("#capacity_private_ip .db_bargraph_barbox_unsafezone").attr("style", "width:"+(usedPercentage - 70)+"%");
- else
- $("#capacity_private_ip .db_bargraph_barbox_unsafezone").attr("style", "width:30%");
- } else {
- $("#capacity_private_ip .db_bargraph_barbox_safezone").attr("style", "width:"+usedPercentage+"%");
- $("#capacity_private_ip .db_bargraph_barbox_unsafezone").attr("style", "width:0%");
- }
- }
- }
- }
- }
- }
- }
- });
-
- $("#capacity_zone_select").bind("change", function(event) {
- var zoneId = $(this).val();
- $.ajax({
- data: createURL("command=listPods&zoneId="+zoneId+"&response=json"+maxPageSize),
- dataType: "json",
- async: false,
- success: function(json) {
- var pods = json.listpodsresponse.pod;
- var podSelect = $("#capacity_pod_select").empty();
- if (pods != null && pods.length > 0) {
- podSelect.append("");
- for (var i = 0; i < pods.length; i++) {
- podSelect.append("");
- }
- }
- $("#capacity_pod_select").change();
- }
- });
- });
- $("#capacity_zone_select").change();
-
- // Show Recent Alerts
- $.ajax({
- data: createURL("command=listAlerts&response=json"),
- dataType: "json",
- success: function(json) {
- var alerts = json.listalertsresponse.alert;
- if (alerts != null && alerts.length > 0) {
- var alertGrid = $("#alert_grid_content").empty();
- var length = (alerts.length>=5) ? 5 : alerts.length;
- for (var i = 0; i < length; i++) {
- var errorTemplate = $("#recent_error_template").clone(true);
- errorTemplate.find("#db_error_type").text(toAlertType(alerts[i].type));
- errorTemplate.find("#db_error_msg").append(fromdb(alerts[i].description));
- setDateField(alerts[i].sent, errorTemplate.find("#db_error_date"));
- alertGrid.append(errorTemplate.show());
- }
- }
- }
- });
-
- // Show Host Alerts
- $.ajax({
- data: createURL("command=listHosts&state=Alert&response=json"),
- dataType: "json",
- success: function(json) {
- var alerts = json.listhostsresponse.host;
- if (alerts != null && alerts.length > 0) {
- var alertGrid = $("#host_alert_grid_content").empty();
- var length = (alerts.length>=4) ? 4 : alerts.length;
- for (var i = 0; i < length; i++) {
- var errorTemplate = $("#recent_error_template").clone(true);
- errorTemplate.find("#db_error_type").text("Host - Alert State");
- errorTemplate.find("#db_error_msg").append("Host - " + fromdb(alerts[i].name) + " has been detected in Alert state.");
- setDateField(alerts[i].disconnected, errorTemplate.find("#db_error_date"));
- alertGrid.append(errorTemplate.show());
- }
- }
- }
- });
-
- $("#alert_more").bind("click", function(event) {
- event.preventDefault();
-
- $("#menutab_role_root #menutab_events").data("showEvents", false).click();
- });
- $("#host_alert_more").bind("click", function(event) {
- event.preventDefault();
- $("#menutab_hosts").click();
- });
-
- $("#tab_dashboard_user, #tab_dashboard_domain, #loading_gridtable").hide();
- $("#tab_dashboard_root").show();
- $("#menutab_role_user").hide();
- $("#menutab_role_root").show();
- $("#menutab_role_domain").hide();
- $("#launch_test").show();
- } else if (isDomainAdmin()) {
- var thisTab = $("#tab_dashboard_domain");
- $("#tab_dashboard_user, #tab_dashboard_root, #loading_gridtable").hide();
- thisTab.show();
- $("#menutab_role_user").hide();
- $("#menutab_role_root").hide();
- $("#menutab_role_domain").show();
- $("#launch_test").hide();
-
- // Need to use/create better API for this as there is a limit of pageSize
- // to list count.
- $.ajax({
- data: createURL("command=listVirtualMachines&response=json"+maxPageSize),
- dataType: "json",
- success: function(json) {
- if (json.listvirtualmachinesresponse.virtualmachine != undefined)
- thisTab.find("#dashboard_instances").text(json.listvirtualmachinesresponse.virtualmachine.length);
- }
- });
- $.ajax({
- data: createURL("command=listVolumes&response=json"+maxPageSize),
- dataType: "json",
- success: function(json) {
- if (json.listvolumesresponse.volume)
- thisTab.find("#dashboard_volumes").text(json.listvolumesresponse.volume.length);
- }
- });
- $.ajax({
- data: createURL("command=listSnapshots&response=json"+maxPageSize),
- dataType: "json",
- success: function(json) {
- if (json.listsnapshotsresponse.snapshot)
- thisTab.find("#dashboard_snapshots").text(json.listsnapshotsresponse.snapshot.length);
- }
- });
- $.ajax({
- data: createURL("command=listAccounts&response=json"+maxPageSize),
- dataType: "json",
- success: function(json) {
- if (json.listaccountsresponse.account)
- thisTab.find("#dashboard_accounts").text(json.listaccountsresponse.account.length);
- }
- });
- $.ajax({
- data: createURL("command=listEvents&level=ERROR&response=json"),
- dataType: "json",
- success: function(json) {
- var events = json.listeventsresponse.event;
- if (events != null && events.length > 0) {
- var errorGrid = thisTab.find("#error_grid_content").empty();
- var length = (events.length>=3) ? 3 : events.length;
- for (var i = 0; i < length; i++) {
- var errorTemplate = $("#recent_error_template").clone(true);
- errorTemplate.find("#db_error_type").text(events[i].type);
- errorTemplate.find("#db_error_msg").text(fromdb(events[i].description));
- setDateField(events[i].created, errorTemplate.find("#db_error_date"));
- errorGrid.append(errorTemplate.show());
- }
- }
- }
- });
- } else if(isUser()) {
- $("#launch_test").hide();
- $.ajax({
- cache: false,
- data: createURL("command=listAccounts&response=json"),
- dataType: "json",
- success: function(json) {
- var accounts = json.listaccountsresponse.account;
- if (accounts != null && accounts.length > 0) {
- var statJSON = accounts[0];
- var sent = parseInt(statJSON.sentbytes);
- var rec = parseInt(statJSON.receivedbytes);
-
- if(sent==0 && rec==0)
- $("#network_bandwidth_panel").hide();
- else
- $("#network_bandwidth_panel").show();
-
- $("#menutab_role_user").show();
- $("#menutab_role_root").hide();
- $("#menutab_role_domain").hide();
- $("#tab_dashboard_user").show();
- $("#tab_dashboard_root, #tab_dashboard_domain, #loading_gridtable").hide();
-
- // This is in bytes, so let's change to KB
- sent = Math.round(sent / 1024);
- rec = Math.round(rec / 1024);
- $("#db_sent").text(sent + "KB");
- $("#db_received").text(rec + "KB");
- $("#db_available_public_ips").text(statJSON.ipavailable);
- $("#db_owned_public_ips").text(statJSON.iptotal);
- $("#db_running_vms").text(statJSON.vmrunning + " VM(s)");
- $("#db_stopped_vms").text(statJSON.vmstopped + " VM(s)");
- $("#db_total_vms").text(statJSON.vmtotal + " VM(s)");
- $("#db_avail_vms").text(statJSON.vmavailable + " VM(s)");
- $("#db_account_id").text(statJSON.id);
- $("#db_account").text(statJSON.name);
- $("#db_type").text(toRole(statJSON.accounttype));
- $("#db_domain").text(statJSON.domain);
- }
-
- // Events
- $.ajax({
- data: createURL("command=listEvents&level=ERROR&response=json"),
- dataType: "json",
- success: function(json) {
- var events = json.listeventsresponse.event;
- if (events != null && events.length > 0) {
- var errorGrid = $("#error_grid_content").empty();
- var length = (events.length>=3) ? 3 : events.length;
- for (var i = 0; i < length; i++) {
- var errorTemplate = $("#recent_error_template").clone(true);
- errorTemplate.find("#db_error_type").text(events[i].type);
- errorTemplate.find("#db_error_msg").text(fromdb(events[i].description));
- setDateField(events[i].created, errorTemplate.find("#db_error_date"));
- errorGrid.append(errorTemplate.show());
- }
- }
- }
- });
- },
- beforeSend: function(XMLHttpRequest) {
- return true;
- }
- });
- } else { //no role
- logout(false);
- return;
- }
- });
- }
-
// Check whether the session is valid.
g_mySession = $.cookie("JSESSIONID");
g_sessionKey = $.cookie("sessionKey");
@@ -955,7 +470,7 @@ $(document).ready(function() {
g_systemVmUseLocalStorage = "false";
$.ajax({
- data: createURL("command=listZones&available=true&response=json"),
+ data: createURL("command=listZones&available=true&response=json"),
dataType: "json",
async: false,
success: function(json) {