mirror of
https://github.com/apache/cloudstack.git
synced 2025-12-21 13:03:10 +01:00
new UI - correct typo.
This commit is contained in:
parent
6506c9b4db
commit
9bb216570b
@ -27,7 +27,7 @@ function alertToMidmenu(jsonObj, $midmenuItem1) {
|
|||||||
$midmenuItem1.find("#second_row").text(jsonObj.type.substring(0,25));
|
$midmenuItem1.find("#second_row").text(jsonObj.type.substring(0,25));
|
||||||
}
|
}
|
||||||
|
|
||||||
function alertToRigntPanel($midmenuItem1) {
|
function alertToRightPanel($midmenuItem1) {
|
||||||
alertJsonToDetailsTab($midmenuItem1);
|
alertJsonToDetailsTab($midmenuItem1);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -74,7 +74,7 @@ function afterLoadDiskOfferingJSP() {
|
|||||||
success: function(json) {
|
success: function(json) {
|
||||||
var item = json.creatediskofferingresponse;
|
var item = json.creatediskofferingresponse;
|
||||||
diskOfferingToMidmenu(item, $midmenuItem1);
|
diskOfferingToMidmenu(item, $midmenuItem1);
|
||||||
bindClickToMidMenu($midmenuItem1, diskOfferingToRigntPanel, getMidmenuId);
|
bindClickToMidMenu($midmenuItem1, diskOfferingToRightPanel, getMidmenuId);
|
||||||
afterAddingMidMenuItem($midmenuItem1, true);
|
afterAddingMidMenuItem($midmenuItem1, true);
|
||||||
},
|
},
|
||||||
error: function(XMLHttpResponse) {
|
error: function(XMLHttpResponse) {
|
||||||
@ -124,7 +124,7 @@ function doUpdateDiskOffering() {
|
|||||||
});
|
});
|
||||||
var $midmenuItem1 = $("#"+getMidmenuId(jsonObj));
|
var $midmenuItem1 = $("#"+getMidmenuId(jsonObj));
|
||||||
diskOfferingToMidmenu(jsonObj, $midmenuItem1);
|
diskOfferingToMidmenu(jsonObj, $midmenuItem1);
|
||||||
diskOfferingToRigntPanel($midmenuItem1);
|
diskOfferingToRightPanel($midmenuItem1);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
@ -140,7 +140,7 @@ function diskOfferingToMidmenu(jsonObj, $midmenuItem1) {
|
|||||||
$midmenuItem1.find("#second_row").text(convertBytes(jsonObj.disksize));
|
$midmenuItem1.find("#second_row").text(convertBytes(jsonObj.disksize));
|
||||||
}
|
}
|
||||||
|
|
||||||
function diskOfferingToRigntPanel($midmenuItem1) {
|
function diskOfferingToRightPanel($midmenuItem1) {
|
||||||
diskOfferingJsonToDetailsTab($midmenuItem1);
|
diskOfferingJsonToDetailsTab($midmenuItem1);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -36,7 +36,7 @@ function eventToMidmenu(jsonObj, $midmenuItem1) {
|
|||||||
$midmenuItem1.find("#second_row").text(jsonObj.type.substring(0,25));
|
$midmenuItem1.find("#second_row").text(jsonObj.type.substring(0,25));
|
||||||
}
|
}
|
||||||
|
|
||||||
function eventToRigntPanel($midmenuItem1) {
|
function eventToRightPanel($midmenuItem1) {
|
||||||
eventJsonToDetailsTab($midmenuItem1);
|
eventJsonToDetailsTab($midmenuItem1);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -57,7 +57,7 @@ function doUpdateGlobalSetting() {
|
|||||||
});
|
});
|
||||||
var $midmenuItem1 = $("#"+globalSettingGetMidmenuId(jsonObj));
|
var $midmenuItem1 = $("#"+globalSettingGetMidmenuId(jsonObj));
|
||||||
globalSettingToMidmenu(jsonObj, $midmenuItem1);
|
globalSettingToMidmenu(jsonObj, $midmenuItem1);
|
||||||
globalSettingToRigntPanel($midmenuItem1);
|
globalSettingToRightPanel($midmenuItem1);
|
||||||
|
|
||||||
$("#dialog_alert_restart_management_server").dialog("open");
|
$("#dialog_alert_restart_management_server").dialog("open");
|
||||||
}
|
}
|
||||||
@ -81,7 +81,7 @@ function globalSettingToMidmenu(jsonObj, $midmenuItem1) {
|
|||||||
$midmenuItem1.find("#second_row").text(fromdb(jsonObj.value).substring(0,25));
|
$midmenuItem1.find("#second_row").text(fromdb(jsonObj.value).substring(0,25));
|
||||||
}
|
}
|
||||||
|
|
||||||
function globalSettingToRigntPanel($midmenuItem1) {
|
function globalSettingToRightPanel($midmenuItem1) {
|
||||||
globalSettingJsonToDetailsTab($midmenuItem1);
|
globalSettingJsonToDetailsTab($midmenuItem1);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -65,24 +65,24 @@ $(document).ready(function() {
|
|||||||
|
|
||||||
// Setup 2nd level navigation
|
// Setup 2nd level navigation
|
||||||
|
|
||||||
bindAndListMidMenuItems($("#leftmenu_event"), "listEvents", "listeventsresponse", "event", "jsp/event.jsp", afterLoadEventJSP, eventToMidmenu, eventToRigntPanel, getMidmenuId, false);
|
bindAndListMidMenuItems($("#leftmenu_event"), "listEvents", "listeventsresponse", "event", "jsp/event.jsp", afterLoadEventJSP, eventToMidmenu, eventToRightPanel, getMidmenuId, false);
|
||||||
bindAndListMidMenuItems($("#leftmenu_alert"), "listAlerts", "listalertsresponse", "alert", "jsp/alert.jsp", afterLoadAlertJSP, alertToMidmenu, alertToRigntPanel, getMidmenuId, false);
|
bindAndListMidMenuItems($("#leftmenu_alert"), "listAlerts", "listalertsresponse", "alert", "jsp/alert.jsp", afterLoadAlertJSP, alertToMidmenu, alertToRightPanel, getMidmenuId, false);
|
||||||
bindAndListMidMenuItems($("#leftmenu_volume"), "listVolumes", "listvolumesresponse", "volume", "jsp/volume.jsp", afterLoadVolumeJSP, volumeToMidmenu, volumeToRigntPanel, getMidmenuId, false);
|
bindAndListMidMenuItems($("#leftmenu_volume"), "listVolumes", "listvolumesresponse", "volume", "jsp/volume.jsp", afterLoadVolumeJSP, volumeToMidmenu, volumeToRightPanel, getMidmenuId, false);
|
||||||
bindAndListMidMenuItems($("#leftmenu_snapshot"), "listSnapshots", "listsnapshotsresponse", "snapshot", "jsp/snapshot.jsp", afterLoadSnapshotJSP, snapshotToMidmenu, snapshotToRigntPanel, getMidmenuId, false);
|
bindAndListMidMenuItems($("#leftmenu_snapshot"), "listSnapshots", "listsnapshotsresponse", "snapshot", "jsp/snapshot.jsp", afterLoadSnapshotJSP, snapshotToMidmenu, snapshotToRightPanel, getMidmenuId, false);
|
||||||
bindAndListMidMenuItems($("#leftmenu_ip"), "listPublicIpAddresses", "listpublicipaddressesresponse", "publicipaddress", "jsp/ipaddress.jsp", afterLoadIpJSP, ipToMidmenu, ipToRigntPanel, ipGetMidmenuId, false);
|
bindAndListMidMenuItems($("#leftmenu_ip"), "listPublicIpAddresses", "listpublicipaddressesresponse", "publicipaddress", "jsp/ipaddress.jsp", afterLoadIpJSP, ipToMidmenu, ipToRightPanel, ipGetMidmenuId, false);
|
||||||
//bindAndListMidMenuItems("leftmenu_router", "listRouters", "listroutersresponse", "router", "jsp/router.jsp", afterLoadRouterJSP, routerToMidmenu, routerToRightPanel, getMidmenuId, false);
|
//bindAndListMidMenuItems("leftmenu_router", "listRouters", "listroutersresponse", "router", "jsp/router.jsp", afterLoadRouterJSP, routerToMidmenu, routerToRightPanel, getMidmenuId, false);
|
||||||
|
|
||||||
bindAndListMidMenuItems($("#leftmenu_submenu_my_template"), "listTemplates&templatefilter=self", "listtemplatesresponse", "template", "jsp/template.jsp", afterLoadTemplateJSP, templateToMidmenu, templateToRigntPanel, templateGetMidmenuId, false);
|
bindAndListMidMenuItems($("#leftmenu_submenu_my_template"), "listTemplates&templatefilter=self", "listtemplatesresponse", "template", "jsp/template.jsp", afterLoadTemplateJSP, templateToMidmenu, templateToRightPanel, templateGetMidmenuId, false);
|
||||||
bindAndListMidMenuItems($("#leftmenu_submenu_featured_template"), "listTemplates&templatefilter=featured", "listtemplatesresponse", "template", "jsp/template.jsp", afterLoadTemplateJSP, templateToMidmenu, templateToRigntPanel, templateGetMidmenuId, false);
|
bindAndListMidMenuItems($("#leftmenu_submenu_featured_template"), "listTemplates&templatefilter=featured", "listtemplatesresponse", "template", "jsp/template.jsp", afterLoadTemplateJSP, templateToMidmenu, templateToRightPanel, templateGetMidmenuId, false);
|
||||||
bindAndListMidMenuItems($("#leftmenu_submenu_community_template"), "listTemplates&templatefilter=community", "listtemplatesresponse", "template", "jsp/template.jsp", afterLoadTemplateJSP, templateToMidmenu, templateToRigntPanel, templateGetMidmenuId, false);
|
bindAndListMidMenuItems($("#leftmenu_submenu_community_template"), "listTemplates&templatefilter=community", "listtemplatesresponse", "template", "jsp/template.jsp", afterLoadTemplateJSP, templateToMidmenu, templateToRightPanel, templateGetMidmenuId, false);
|
||||||
|
|
||||||
bindAndListMidMenuItems($("#leftmenu_submenu_my_iso"), "listIsos&isofilter=self", "listisosresponse", "iso", "jsp/iso.jsp", afterLoadIsoJSP, isoToMidmenu, isoToRightPanel, isoGetMidmenuId, false);
|
bindAndListMidMenuItems($("#leftmenu_submenu_my_iso"), "listIsos&isofilter=self", "listisosresponse", "iso", "jsp/iso.jsp", afterLoadIsoJSP, isoToMidmenu, isoToRightPanel, isoGetMidmenuId, false);
|
||||||
bindAndListMidMenuItems($("#leftmenu_submenu_featured_iso"), "listIsos&isofilter=featured", "listisosresponse", "iso", "jsp/iso.jsp", afterLoadIsoJSP, isoToMidmenu, isoToRightPanel, isoGetMidmenuId, false);
|
bindAndListMidMenuItems($("#leftmenu_submenu_featured_iso"), "listIsos&isofilter=featured", "listisosresponse", "iso", "jsp/iso.jsp", afterLoadIsoJSP, isoToMidmenu, isoToRightPanel, isoGetMidmenuId, false);
|
||||||
bindAndListMidMenuItems($("#leftmenu_submenu_community_iso"), "listIsos&isofilter=community", "listisosresponse", "iso", "jsp/iso.jsp", afterLoadIsoJSP, isoToMidmenu, isoToRightPanel, isoGetMidmenuId, false);
|
bindAndListMidMenuItems($("#leftmenu_submenu_community_iso"), "listIsos&isofilter=community", "listisosresponse", "iso", "jsp/iso.jsp", afterLoadIsoJSP, isoToMidmenu, isoToRightPanel, isoGetMidmenuId, false);
|
||||||
|
|
||||||
bindAndListMidMenuItems($("#leftmenu_service_offering"), "listServiceOfferings", "listserviceofferingsresponse", "serviceoffering", "jsp/serviceoffering.jsp", afterLoadServiceOfferingJSP, serviceOfferingToMidmenu, serviceOfferingToRightPanel, getMidmenuId, false);
|
bindAndListMidMenuItems($("#leftmenu_service_offering"), "listServiceOfferings", "listserviceofferingsresponse", "serviceoffering", "jsp/serviceoffering.jsp", afterLoadServiceOfferingJSP, serviceOfferingToMidmenu, serviceOfferingToRightPanel, getMidmenuId, false);
|
||||||
bindAndListMidMenuItems($("#leftmenu_disk_offering"), "listDiskOfferings", "listdiskofferingsresponse", "diskoffering", "jsp/diskoffering.jsp", afterLoadDiskOfferingJSP, diskOfferingToMidmenu, diskOfferingToRigntPanel, getMidmenuId, false);
|
bindAndListMidMenuItems($("#leftmenu_disk_offering"), "listDiskOfferings", "listdiskofferingsresponse", "diskoffering", "jsp/diskoffering.jsp", afterLoadDiskOfferingJSP, diskOfferingToMidmenu, diskOfferingToRightPanel, getMidmenuId, false);
|
||||||
bindAndListMidMenuItems($("#leftmenu_global_setting"), "listConfigurations", "listconfigurationsresponse", "configuration", "jsp/globalsetting.jsp", afterLoadGlobalSettingJSP, globalSettingToMidmenu, globalSettingToRigntPanel, globalSettingGetMidmenuId, false);
|
bindAndListMidMenuItems($("#leftmenu_global_setting"), "listConfigurations", "listconfigurationsresponse", "configuration", "jsp/globalsetting.jsp", afterLoadGlobalSettingJSP, globalSettingToMidmenu, globalSettingToRightPanel, globalSettingGetMidmenuId, false);
|
||||||
|
|
||||||
$("#leftmenu_instances").bind("click", function(event) {
|
$("#leftmenu_instances").bind("click", function(event) {
|
||||||
selectLeftMenu($(this), true);
|
selectLeftMenu($(this), true);
|
||||||
|
|||||||
@ -62,7 +62,7 @@ function afterLoadIpJSP() {
|
|||||||
var item = json.associateipaddressresponse;
|
var item = json.associateipaddressresponse;
|
||||||
//$("#dialog_info").html("<p>The IP address <b>"+items[0].ipaddress+"</b> has been assigned to your account</p>").dialog("open");
|
//$("#dialog_info").html("<p>The IP address <b>"+items[0].ipaddress+"</b> has been assigned to your account</p>").dialog("open");
|
||||||
ipToMidmenu(item, $midmenuItem1);
|
ipToMidmenu(item, $midmenuItem1);
|
||||||
bindClickToMidMenu($midmenuItem1, ipToRigntPanel, ipGetMidmenuId);
|
bindClickToMidMenu($midmenuItem1, ipToRightPanel, ipGetMidmenuId);
|
||||||
afterAddingMidMenuItem($midmenuItem1, true);
|
afterAddingMidMenuItem($midmenuItem1, true);
|
||||||
|
|
||||||
},
|
},
|
||||||
@ -209,7 +209,7 @@ function isIpManageable(domainid, account) {
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
function ipToRigntPanel($midmenuItem1) {
|
function ipToRightPanel($midmenuItem1) {
|
||||||
var ipObj = $midmenuItem1.data("jsonObj");
|
var ipObj = $midmenuItem1.data("jsonObj");
|
||||||
|
|
||||||
//Details tab
|
//Details tab
|
||||||
|
|||||||
@ -58,7 +58,7 @@ function snapshotToMidmenu(jsonObj, $midmenuItem1) {
|
|||||||
$midmenuItem1.find("#second_row").text(fromdb(jsonObj.volumename).substring(0,25));
|
$midmenuItem1.find("#second_row").text(fromdb(jsonObj.volumename).substring(0,25));
|
||||||
}
|
}
|
||||||
|
|
||||||
function snapshotToRigntPanel($midmenuItem1) {
|
function snapshotToRightPanel($midmenuItem1) {
|
||||||
snapshotJsonToDetailsTab($midmenuItem1);
|
snapshotJsonToDetailsTab($midmenuItem1);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -93,14 +93,14 @@ function afterLoadTemplateJSP() {
|
|||||||
success: function(json) {
|
success: function(json) {
|
||||||
var items = json.registertemplateresponse.template;
|
var items = json.registertemplateresponse.template;
|
||||||
templateToMidmenu(items[0], $midmenuItem1);
|
templateToMidmenu(items[0], $midmenuItem1);
|
||||||
bindClickToMidMenu($midmenuItem1, templateToRigntPanel, templateGetMidmenuId);
|
bindClickToMidMenu($midmenuItem1, templateToRightPanel, templateGetMidmenuId);
|
||||||
afterAddingMidMenuItem($midmenuItem1, true);
|
afterAddingMidMenuItem($midmenuItem1, true);
|
||||||
|
|
||||||
if(items.length > 1) {
|
if(items.length > 1) {
|
||||||
for(var i=1; i<items.length; i++) {
|
for(var i=1; i<items.length; i++) {
|
||||||
var $midmenuItem2 = $("#midmenu_item").clone();
|
var $midmenuItem2 = $("#midmenu_item").clone();
|
||||||
templateToMidmenu(items[i], $midmenuItem2);
|
templateToMidmenu(items[i], $midmenuItem2);
|
||||||
bindClickToMidMenu($midmenuItem2, templateToRigntPanel, templateGetMidmenuId);
|
bindClickToMidMenu($midmenuItem2, templateToRightPanel, templateGetMidmenuId);
|
||||||
$("#midmenu_container").append($midmenuItem2.show());
|
$("#midmenu_container").append($midmenuItem2.show());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -225,7 +225,7 @@ function templateToMidmenu(jsonObj, $midmenuItem1) {
|
|||||||
$midmenuItem1.find("#second_row").text(fromdb(jsonObj.zonename).substring(0,25));
|
$midmenuItem1.find("#second_row").text(fromdb(jsonObj.zonename).substring(0,25));
|
||||||
}
|
}
|
||||||
|
|
||||||
function templateToRigntPanel($midmenuItem1) {
|
function templateToRightPanel($midmenuItem1) {
|
||||||
templateJsonToDetailsTab($midmenuItem1);
|
templateJsonToDetailsTab($midmenuItem1);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -143,7 +143,7 @@ function afterLoadVolumeJSP() {
|
|||||||
if (result.jobstatus == 1) {
|
if (result.jobstatus == 1) {
|
||||||
// Succeeded
|
// Succeeded
|
||||||
volumeToMidmenu(result.volume[0], $midmenuItem1);
|
volumeToMidmenu(result.volume[0], $midmenuItem1);
|
||||||
bindClickToMidMenu($midmenuItem1, volumeToRigntPanel, getMidmenuId);
|
bindClickToMidMenu($midmenuItem1, volumeToRightPanel, getMidmenuId);
|
||||||
afterAddingMidMenuItem($midmenuItem1, true);
|
afterAddingMidMenuItem($midmenuItem1, true);
|
||||||
} else if (result.jobstatus == 2) {
|
} else if (result.jobstatus == 2) {
|
||||||
handleAsyncJobFailInMidMenu(result.jobresult, $midmenuItem1);
|
handleAsyncJobFailInMidMenu(result.jobresult, $midmenuItem1);
|
||||||
@ -400,7 +400,7 @@ function volumeToMidmenu(jsonObj, $midmenuItem1) {
|
|||||||
$midmenuItem1.find("#second_row").text(jsonObj.type.substring(0,25));
|
$midmenuItem1.find("#second_row").text(jsonObj.type.substring(0,25));
|
||||||
}
|
}
|
||||||
|
|
||||||
function volumeToRigntPanel($midmenuItem1) {
|
function volumeToRightPanel($midmenuItem1) {
|
||||||
volumeJsonToDetailsTab($midmenuItem1);
|
volumeJsonToDetailsTab($midmenuItem1);
|
||||||
var jsonObj = $midmenuItem1.data("jsonObj");
|
var jsonObj = $midmenuItem1.data("jsonObj");
|
||||||
volumeJsonToSnapshotTab(jsonObj);
|
volumeJsonToSnapshotTab(jsonObj);
|
||||||
@ -881,7 +881,7 @@ var volumeSnapshotActionMap = {
|
|||||||
var $midmenuItem1 = $("#midmenu_item").clone();
|
var $midmenuItem1 = $("#midmenu_item").clone();
|
||||||
$("#midmenu_container").append($midmenuItem1.show());
|
$("#midmenu_container").append($midmenuItem1.show());
|
||||||
volumeToMidmenu(jsonObj, $midmenuItem1);
|
volumeToMidmenu(jsonObj, $midmenuItem1);
|
||||||
bindClickToMidMenu($midmenuItem1, volumeToRigntPanel);
|
bindClickToMidMenu($midmenuItem1, volumeToRightPanel);
|
||||||
*/
|
*/
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user