diff --git a/ui/l10n/en.js b/ui/l10n/en.js index 7e705131bcf..8e25c54b04c 100644 --- a/ui/l10n/en.js +++ b/ui/l10n/en.js @@ -674,7 +674,6 @@ var dictionary = { "label.deleting.processing":"Deleting....", "label.deny":"Deny", "label.deployment.planner":"Deployment planner", -"label.deploy.as.is":"Deploy As-Is", "label.description":"Description", "label.destination.physical.network.id":"Destination physical network ID", "label.destination.zone":"Destination Zone", diff --git a/ui/scripts/docs.js b/ui/scripts/docs.js index 19a7ad0441b..a801a6b52e0 100755 --- a/ui/scripts/docs.js +++ b/ui/scripts/docs.js @@ -1243,10 +1243,6 @@ cloudStack.docs = { desc: 'The Management Server will download the file from the specified URL, such as http://my.web.server/filename.vhd.gz', externalLink: '' }, - helpRegisterTemplateDeployAsIs: { - desc: 'Vmware Only: Deploy with specifications from OVF instead of orchestrated specs', - externalLink: '' - }, helpRegisterTemplateDirectDownload: { desc: 'KVM Only: Secondary Storage is bypassed and template/ISO is downloaded to Primary Storage on deployment', externalLink: '' diff --git a/ui/scripts/templates.js b/ui/scripts/templates.js index aeae6f04cc0..8660c5c34c9 100644 --- a/ui/scripts/templates.js +++ b/ui/scripts/templates.js @@ -245,10 +245,9 @@ args.$select.change(function() { var $form = $(this).closest('form'); if ($(this).val() == "VMware") { - $form.find('.form-item[rel=rootDiskControllerType]').css('display', 'inline-block'); - $form.find('.form-item[rel=nicAdapterType]').css('display', 'inline-block'); + $form.find('.form-item[rel=rootDiskControllerType]').hide(); + $form.find('.form-item[rel=nicAdapterType]').hide(); $form.find('.form-item[rel=keyboardType]').css('display', 'inline-block'); - $form.find('.form-item[rel=deployAsIs]').css('display', 'inline-block'); $form.find('.form-item[rel=xenserverToolsVersion61plus]').hide(); $form.find('.form-item[rel=rootDiskControllerTypeKVM]').hide(); $form.find('.form-item[rel=directdownload]').hide(); @@ -259,7 +258,6 @@ $form.find('.form-item[rel=keyboardType]').hide(); $form.find('.form-item[rel=rootDiskControllerTypeKVM]').hide(); $form.find('.form-item[rel=directdownload]').hide(); - $form.find('.form-item[rel=deployAsIs]').hide(); $form.find('.form-item[rel=requireshvm]').css('display', 'inline-block'); if (isAdmin()) { @@ -270,7 +268,6 @@ $form.find('.form-item[rel=nicAdapterType]').hide(); $form.find('.form-item[rel=keyboardType]').hide(); $form.find('.form-item[rel=xenserverToolsVersion61plus]').hide(); - $form.find('.form-item[rel=deployAsIs]').hide(); $form.find('.form-item[rel=rootDiskControllerTypeKVM]').css('display', 'inline-block'); $('#label_root_disk_controller').prop('selectedIndex', 2); $form.find('.form-item[rel=requireshvm]').css('display', 'inline-block'); @@ -284,7 +281,6 @@ $form.find('.form-item[rel=xenserverToolsVersion61plus]').hide(); $form.find('.form-item[rel=rootDiskControllerTypeKVM]').hide(); $form.find('.form-item[rel=directdownload]').hide(); - $form.find('.form-item[rel=deployAsIs]').hide(); $form.find('.form-item[rel=requireshvm]').css('display', 'inline-block'); } }); @@ -467,13 +463,6 @@ }); } }, - deployAsIs : { - label: 'label.deploy.as.is', - docID: 'helpRegisterTemplateDeployAsIs', - isBoolean: true, - dependsOn: 'hypervisor', - isHidden: true - }, // fields for hypervisor == "VMware" (ends here) format: { @@ -694,11 +683,6 @@ 'details[0].keyboard': args.data.keyboardType }); } - if (args.$form.find('.form-item[rel=deployAsIs]').css("display") != "none" && args.data.deployAsIs != "") { - $.extend(data, { - deployAsIs: (args.data.deployAsIs == "on") ? "true" : "false" - }); - } // for hypervisor == VMware (ends here) $.ajax({ @@ -1924,11 +1908,6 @@ isBoolean: true, converter: cloudStack.converters.toBooleanText }, - deployAsIs: { - label: 'label.deploy.as.is', - isBoolean: true, - converter: cloudStack.converters.toBooleanText - }, isextractable: { label: 'label.extractable.lower', isBoolean: true, @@ -2811,11 +2790,6 @@ docID: 'helpRegisterISOFeatured', isBoolean: true, isHidden: true - }, - deployAsIs : { - label: 'label.deploy.as.is', - docID: 'helpRegisterTemplateDeployAsIs', - isBoolean: true } } }, @@ -2829,8 +2803,7 @@ zoneid: args.data.zone, isextractable: (args.data.isExtractable == "on"), bootable: (args.data.isBootable == "on"), - directdownload: (args.data.directdownload == "on"), - deployAsIs: (args.data.deployAsIs == "on") + directdownload: (args.data.directdownload == "on") }; if (args.$form.find('.form-item[rel=osTypeId]').css("display") != "none") { @@ -3667,11 +3640,6 @@ isBoolean: true, converter: cloudStack.converters.toBooleanText }, - deployAsIs: { - label: 'label.deploy.as.is', - isBoolean: true, - converter: cloudStack.converters.toBooleanText - }, size: { label: 'label.size', converter: function(args) {