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:
NIKITA 2010-10-11 17:22:21 -07:00
parent 23dc742c12 2f6c1d5fff
commit 634b67ce07
8 changed files with 73 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
client/WEB-INF/classes/resources/resource.properties
View File

@ -63,6 +63,7 @@ disk.size = Disk Size
value = Value
description = Description
category = Category
hypervisor = Hypervisor
disk.offering = Disk Offering
copy.ISO.to = Copy ISO to

10
ui/new/jsp/iso.jsp
View File

@ -244,7 +244,15 @@
<label><%=t.t("disk.offering")%>:</label>
<select class="select" id="disk_offering">
</select>
</li>
</li>
<li>
<label><%=t.t("hypervisor")%>:</label>
<select class="select" id="hypervisor">
<option value='XenServer'>Citrix XenServer</option>
<option value='VmWare'>VMware ESX</option>
<option value='KVM'>KVM</option>
</select>
</li>
</ol>
</form>
</div>

3
ui/new/scripts/cloud.core2.diskoffering.js
View File

@ -141,7 +141,7 @@ function diskOfferingJsonToDetailsTab(jsonObj) {
$detailsTab.find("#tags").text(fromdb(jsonObj.tags));
$detailsTab.find("#domain").text(fromdb(jsonObj.domain));
//actions ***
//actions ***
var $actionMenu = $("#right_panel_content #tab_content_details #action_link #action_menu");
$actionMenu.find("#action_list").empty();
var midmenuItemId = getMidmenuId(jsonObj);
@ -168,7 +168,6 @@ function diskOfferingClearDetailsTab() {
$actionMenu.find("#action_list").append($("#no_available_actions").clone().show());
}
var diskOfferingActionMap = {
"Delete Disk Offering": {
api: "deleteDiskOffering",

3
ui/new/scripts/cloud.core2.instance.js
View File

@ -549,7 +549,8 @@ function clickInstanceGroupHeader($arrowIcon) {
$("body").stopTime(timerKey);
if (result.jobstatus == 1) {
// Succeeded
vmToMidmenu(result.virtualmachine[0], $midmenuItem1);
vmToMidmenu(result.virtualmachine[0], $midmenuItem1);
bindClickToMidMenu($midmenuItem1, vmToRightPanel, getMidmenuId);
if (result.virtualmachine[0].passwordenabled == 'true') {
var extraMessage = "New password: " + result.virtualmachine[0].password;
afterAddingMidMenuItem($midmenuItem1, true, extraMessage);

19
ui/new/scripts/cloud.core2.iso.js
View File

@ -397,13 +397,20 @@ function doCreateVMFromIso($actionLink, $detailsTab, midmenuItemId) {
if (!isValid) return;
thisDialog.dialog("close");
var name = trim(thisDialog.find("#name").val());
var group = trim(thisDialog.find("#group").val());
var serviceOfferingId = thisDialog.find("#service_offering").val();
var diskOfferingId = thisDialog.find("#disk_offering").val();
var array1 = [];
var name = trim(thisDialog.find("#name").val());
array1.push("&displayname="+todb(name));
var group = trim(thisDialog.find("#group").val());
array1.push("&group="+todb(group));
var serviceOfferingId = thisDialog.find("#service_offering").val();
array1.push("&serviceOfferingId="+serviceOfferingId);
var diskOfferingId = thisDialog.find("#disk_offering").val();
array1.push("&diskOfferingId="+diskOfferingId);
var hypervisor = thisDialog.find("#hypervisor").val();
array1.push("&hypervisor="+hypervisor);
var apiCommand = "command=deployVirtualMachine&zoneId="+zoneId+"&serviceOfferingId="+serviceOfferingId+"&diskOfferingId="+diskOfferingId+"&templateId="+id+"&group="+todb(group)+"&displayname="+todb(name);
var apiCommand = "command=deployVirtualMachine&zoneId="+zoneId+"&templateId="+id+array1.join("");
doActionToDetailsTab(id, $actionLink, apiCommand, midmenuItemId);
},
"Cancel": function() {

46
ui/new/scripts/cloud.core2.serviceoffering.js
View File

@ -164,4 +164,48 @@ function serviceOfferingJsonToDetailsTab(jsonObj) {
$detailsTab.find("#networktype").text(toNetworkType(jsonObj.usevirtualnetwork));
$detailsTab.find("#tags").text(fromdb(jsonObj.tags));
setDateField(jsonObj.created, $detailsTab.find("#created"));
}
//actions ***
var $actionMenu = $("#right_panel_content #tab_content_details #action_link #action_menu");
$actionMenu.find("#action_list").empty();
var midmenuItemId = getMidmenuId(jsonObj);
buildActionLinkForDetailsTab("Delete Service Offering", serviceOfferingActionMap, $actionMenu, midmenuItemId);
}
function serviceOfferingClearRightPanel() {
serviceOfferingClearDetailsTab();
}
function serviceOfferingClearDetailsTab() {
var $detailsTab = $("#right_panel_content #tab_content_details");
$detailsTab.find("#id").text("");
$detailsTab.find("#name").text("");
$detailsTab.find("#name_edit").val("");
$detailsTab.find("#displaytext").text("");
$detailsTab.find("#displaytext_edit").val("");
$detailsTab.find("#storagetype").text("");
$detailsTab.find("#cpu").text("");
$detailsTab.find("#memory").text("");
$detailsTab.find("#offerha").text("");
$detailsTab.find("#offerha_edit").val("");
$detailsTab.find("#networktype").text("");
$detailsTab.find("#tags").text("");
$detailsTab.find("#created").text("");
var $actionMenu = $("#right_panel_content #tab_content_details #action_link #action_menu");
$actionMenu.find("#action_list").empty();
$actionMenu.find("#action_list").append($("#no_available_actions").clone().show());
}
var serviceOfferingActionMap = {
"Delete Service Offering": {
api: "deleteServiceOffering",
isAsyncJob: false,
inProcessText: "Deleting service offering....",
afterActionSeccessFn: function(json, id, midmenuItemId) {
$("#"+midmenuItemId).remove();
clearRightPanel();
serviceOfferingClearRightPanel();
}
}
}

2
ui/new/scripts/cloud.core2.template.js
View File

@ -353,7 +353,7 @@ var templateActionMap = {
},
"Copy Template": {
isAsyncJob: true,
asyncJobResponse: "createtemplateresponse",
asyncJobResponse: "copytemplateresponse",
dialogBeforeActionFn : doCopyTemplate,
inProcessText: "Copying Template....",
afterActionSeccessFn: function(json, id, midmenuItemId){}

2
ui/new/scripts/cloud.core2.volume.js
View File

@ -124,7 +124,7 @@ function afterLoadVolumeJSP() {
if (result.jobstatus == 1) {
// Succeeded
volumeToMidmenu(result.volume[0], $midmenuItem1);
bindClickToMidMenu($midmenuItem1, volumeToRigntPanel);
bindClickToMidMenu($midmenuItem1, volumeToRigntPanel, getMidmenuId);
afterAddingMidMenuItem($midmenuItem1, true);
} else if (result.jobstatus == 2) {
handleAsyncJobFailInMidMenu(result.jobresult, $midmenuItem1);