apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

new UI - vm wizard - show zone, template, service offering, disk offering in last step.

Browse Source
This commit is contained in:
jessica 2010-08-30 16:00:03 -07:00 committed by unknown
parent 4cb63826a6
commit 5b3db0fc54
2 changed files with 65 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
ui/new/jsp/tab_instance.jsp
View File

@ -273,14 +273,13 @@
<div class="vmpopup_maincontentarea"> <div class="vmpopup_maincontentarea">
<div class="vmpopup_titlebox"> <div class="vmpopup_titlebox">
<h2> <h2>
Step 2: <strong>Select a Service</strong></h2> Step 2: <strong>Service Offering</strong></h2>
<p> <p><!--
Please select the CPU, Memory and Storage requirement you need for your new Virtual Please select the CPU, Memory and Storage requirement you need for your new Virtual
Instance</p> Instance--></p>
</div> </div>
<div class="vmpopup_contentpanel"> <div class="vmpopup_contentpanel">
<h3> <h3><!--Service Offering--></h3>
Service Offering</h3>
<div class="vmpopup_offeringpanel" id="service_offering_container"> <div class="vmpopup_offeringpanel" id="service_offering_container">
<!-- <!--
<div class="vmpopup_offeringbox"> <div class="vmpopup_offeringbox">
@ -368,14 +367,11 @@
<div class="vmpopup_maincontentarea"> <div class="vmpopup_maincontentarea">
<div class="vmpopup_titlebox"> <div class="vmpopup_titlebox">
<h2> <h2>
Step 3: <strong>Additional Data Disk Offering</strong></h2> Step 3: <strong id="step3_label">Select a Disk Offering</strong></h2>
<p> <p></p>
Please select the CPU, Memory and Storage requirement you need for your new Virtual
Instance</p>
</div> </div>
<div class="vmpopup_contentpanel"> <div class="vmpopup_contentpanel">
<h3> <h3></h3>
Data Disk Offering</h3>
<div class="vmpopup_offeringpanel" id="data_disk_offering_container" style="display:none"> <div class="vmpopup_offeringpanel" id="data_disk_offering_container" style="display:none">
</div> </div>
<div class="vmpopup_offeringpanel" id="root_disk_offering_container" style="display:none"> <div class="vmpopup_offeringpanel" id="root_disk_offering_container" style="display:none">
@ -411,14 +407,11 @@
<div class="vmpopup_maincontentarea"> <div class="vmpopup_maincontentarea">
<div class="vmpopup_titlebox"> <div class="vmpopup_titlebox">
<h2> <h2>
Step 4: <strong>Choose your Network</strong></h2> Step 4: <strong>Network</strong></h2>
<p> <p></p>
Please select the CPU, Memory and Storage requirement you need for your new Virtual
Instance</p>
</div> </div>
<div class="vmpopup_contentpanel"> <div class="vmpopup_contentpanel">
<h3> <h3></h3>
Network Offering</h3>
<div class="vmpopup_offeringpanel"> <div class="vmpopup_offeringpanel">
<div class="vmpopup_offeringbox"> <div class="vmpopup_offeringbox">
<input type="radio" name="radiogroup" class="radio" /> <input type="radio" name="radiogroup" class="radio" />
@ -488,13 +481,10 @@
<div class="vmpopup_titlebox"> <div class="vmpopup_titlebox">
<h2> <h2>
Step 5: <strong>Last Step</strong></h2> Step 5: <strong>Last Step</strong></h2>
<p> <p></p>
Please select the CPU, Memory and Storage requirement you need for your new Virtual
Instance</p>
</div> </div>
<div class="vmpopup_contentpanel"> <div class="vmpopup_contentpanel">
<h3> <h3></h3>
Network Offering</h3>
<div class="vmpopup_offeringpanel" style="margin-top: 10px;"> <div class="vmpopup_offeringpanel" style="margin-top: 10px;">
<div class="vmpopup_reviewbox_odd"> <div class="vmpopup_reviewbox_odd">
<div class="vmopopup_reviewtextbox"> <div class="vmopopup_reviewtextbox">
@ -502,7 +492,7 @@
</div> </div>
<div class="vmopopup_review_label"> <div class="vmopopup_review_label">
Zone:</div> Zone:</div>
<span>US West</span> <span id="wizard_review_zone"></span>
</div> </div>
</div> </div>
<div class="vmpopup_reviewbox_even"> <div class="vmpopup_reviewbox_even">
@ -512,7 +502,7 @@
<div class="vmopopup_review_label"> <div class="vmopopup_review_label">
Template: Template:
</div> </div>
<span>CentOS 5.4 64-bit Web Server (Apache)</span> <span id="wizard_review_template"></span>
</div> </div>
</div> </div>
<div class="vmpopup_reviewbox_odd"> <div class="vmpopup_reviewbox_odd">
@ -520,18 +510,27 @@
<div class="vmpopup_reviewtick"> <div class="vmpopup_reviewtick">
</div> </div>
<div class="vmopopup_review_label"> <div class="vmopopup_review_label">
Zone:</div> Service Offering:</div>
<span>US West</span> <span id="wizard_review_service_offering"></span>
</div> </div>
</div> </div>
<div class="vmpopup_reviewbox_even"> <div class="vmpopup_reviewbox_even">
<div class="vmopopup_reviewtextbox"> <div class="vmopopup_reviewtextbox">
<div class="vmpopup_reviewtick"> <div class="vmpopup_reviewtick">
</div> </div>
<div class="vmopopup_review_label"> <div class="vmopopup_review_label" id="wizard_review_disk_offering_label">
Template: Disk Offering:
</div> </div>
<span>CentOS 5.4 64-bit Web Server (Apache)</span> <span id="wizard_review_disk_offering"></span>
</div>
</div>
<div class="vmpopup_reviewbox_odd">
<div class="vmopopup_reviewtextbox">
<div class="vmpopup_reviewtick">
</div>
<div class="vmopopup_review_label">
Network:</div>
<span id="wizard_review_network"></span>
</div> </div>
</div> </div>
</div> </div>

74
ui/new/scripts/cloud.core.instance.js
View File

@ -849,7 +849,7 @@ function clickInstanceGroupHeader($arrowIcon) {
event.preventDefault(); event.preventDefault();
event.stopPropagation(); event.stopPropagation();
var $thisPopup = $vmPopup; var $thisPopup = $vmPopup;
if (currentStepInVmPopup == 1) { //template/ISO if (currentStepInVmPopup == 1) { //select a template
// prevent a person from moving on if no templates are selected // prevent a person from moving on if no templates are selected
// if($thisPopup.find("#step1 #template_container .rev_wiztemplistbox_selected").length == 0) { // if($thisPopup.find("#step1 #template_container .rev_wiztemplistbox_selected").length == 0) {
// $thisPopup.find("#step1 #wiz_message").show(); // $thisPopup.find("#step1 #wiz_message").show();
@ -857,41 +857,31 @@ function clickInstanceGroupHeader($arrowIcon) {
// } // }
if ($thisPopup.find("#wiz_blank").hasClass("rev_wizmid_selectedtempbut")) { //ISO if ($thisPopup.find("#wiz_blank").hasClass("rev_wizmid_selectedtempbut")) { //ISO
$("#root_disk_offering_container").show(); $thisPopup.find("#step3_label").text("Root Disk Offering");
$("#data_disk_offering_container").hide(); $thisPopup.find("#root_disk_offering_container").show();
/* $thisPopup.find("#data_disk_offering_container").hide();
$thisPopup.find("#wizard_review_root_disk_offering").text($thisPopup.find("#wizard_root_disk_offering input[name=rootdisk]:checked").next().text());
$thisPopup.find("#wizard_review_root_disk_offering_p").show();
$thisPopup.find("#wizard_review_iso").text($thisPopup.find("#step1 .rev_wiztemplistbox_selected .rev_wiztemp_listtext").text());
$thisPopup.find("#wizard_review_iso_p").show();
$thisPopup.find("#wizard_review_data_disk_offering_p").hide();
$thisPopup.find("#wizard_review_template").text("Blank Template");
*/
} else { //template } else { //template
$("#data_disk_offering_container").show(); $thisPopup.find("#step3_label").text("Data Disk Offering");
$("#root_disk_offering_container").hide(); $thisPopup.find("#data_disk_offering_container").show();
/* $thisPopup.find("#root_disk_offering_container").hide();
$thisPopup.find("#wizard_review_template").text($thisPopup.find("#step1 .rev_wiztemplistbox_selected .rev_wiztemp_listtext").text());
$thisPopup.find("#wizard_review_data_disk_offering_p").show();
$thisPopup.find("#wizard_review_data_disk_offering").text($thisPopup.find("#wizard_data_disk_offering input[name=datadisk]:checked").next().text());
$thisPopup.find("#wizard_review_root_disk_offering_p").hide();
$thisPopup.find("#wizard_review_iso_p").hide();
*/
} }
$thisPopup.find("#wizard_review_service_offering").text($thisPopup.find("#wizard_service_offering input[name=service]:checked").next().text());
$thisPopup.find("#wizard_review_zone").text($thisPopup.find("#wizard_zone option:selected").text());
$thisPopup.find("#wizard_review_name").text($thisPopup.find("#wizard_vm_name").val());
$thisPopup.find("#wizard_review_group").text($thisPopup.find("#wizard_vm_group").val());
if($thisPopup.find("#wizard_network_groups_container").css("display") != "none" && $thisPopup.find("#wizard_network_groups").val() != null) { $thisPopup.find("#wizard_review_zone").text($thisPopup.find("#wizard_zone option:selected").text());
var networkGroupList = $thisPopup.find("#wizard_network_groups").val().join(","); $thisPopup.find("#wizard_review_template").text($thisPopup.find("#step1 .rev_wiztemplistbox_selected .rev_wiztemp_listtext").text());
$thisPopup.find("#wizard_review_network_groups_p").show();
$thisPopup.find("#wizard_review_network_groups").text(networkGroupList); // $thisPopup.find("#wizard_review_service_offering").text($thisPopup.find("#wizard_service_offering input[name=service]:checked").next().text());
} else { // $thisPopup.find("#wizard_review_zone").text($thisPopup.find("#wizard_zone option:selected").text());
$thisPopup.find("#wizard_review_network_groups_p").hide(); // $thisPopup.find("#wizard_review_name").text($thisPopup.find("#wizard_vm_name").val());
$thisPopup.find("#wizard_review_network_groups").text(""); // $thisPopup.find("#wizard_review_group").text($thisPopup.find("#wizard_vm_group").val());
} //
// if($thisPopup.find("#wizard_network_groups_container").css("display") != "none" && $thisPopup.find("#wizard_network_groups").val() != null) {
// var networkGroupList = $thisPopup.find("#wizard_network_groups").val().join(",");
// $thisPopup.find("#wizard_review_network_groups_p").show();
// $thisPopup.find("#wizard_review_network_groups").text(networkGroupList);
// } else {
// $thisPopup.find("#wizard_review_network_groups_p").hide();
// $thisPopup.find("#wizard_review_network_groups").text("");
// }
} }
@ -903,6 +893,9 @@ function clickInstanceGroupHeader($arrowIcon) {
// $thisPopup.find("#step2 #wiz_message").show(); // $thisPopup.find("#step2 #wiz_message").show();
// return false; // return false;
// } // }
$thisPopup.find("#wizard_review_service_offering").text($thisPopup.find("input:radio[name=service_offering_radio]:checked").next().text());
} }
if(currentStepInVmPopup ==3) { //disk offering if(currentStepInVmPopup ==3) { //disk offering
@ -922,15 +915,22 @@ function clickInstanceGroupHeader($arrowIcon) {
return false; return false;
} }
*/ */
if($thisPopup.find("#wiz_blank").hasClass("rev_wizmid_selectedtempbut")) { //ISO
$thisPopup.find("#wizard_review_disk_offering_label").text("Root Disk Offering:");
$thisPopup.find("#wizard_review_disk_offering").text($thisPopup.find("#root_disk_offering_container input[name=disk_offering_radio]:checked").next().text());
}
else { //template
$thisPopup.find("#wizard_review_disk_offering_label").text("Data Disk Offering:");
$thisPopup.find("#wizard_review_disk_offering").text($thisPopup.find("#data_disk_offering_container input[name=disk_offering_radio]:checked").next().text());
}
} }
if (currentStepInVmPopup == 4) { if (currentStepInVmPopup == 4) { //network
} }
if (currentStepInVmPopup == 5) { if (currentStepInVmPopup == 5) { //last step
// Create a new VM!!!! // Create a new VM!!!!
var moreCriteria = []; var moreCriteria = [];
moreCriteria.push("&zoneId="+$thisPopup.find("#wizard_zone").val()); moreCriteria.push("&zoneId="+$thisPopup.find("#wizard_zone").val());