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 - #3386 - allocate dedicated zones to domains

Browse Source
This commit is contained in:
Jessica Wang 2010-11-03 11:40:53 -07:00
parent 15a316484e
commit 8409578d1d
3 changed files with 52 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
ui/jsp/resource.jsp
View File

@ -67,7 +67,23 @@
<label for="add_zone_guestcidraddress">Guest CIDR:</label>
<input class="text" type="text" id="add_zone_guestcidraddress" value="10.1.1.0/24"/>
<div id="add_zone_guestcidraddress_errormsg" class="dialog_formcontent_errormsg" style="display:none;" ></div>
</li>
<li>
<label>Public?:</label>
<select class="select" id="add_zone_public">
<option value="true">Yes</option>
<option value="false">No</option>
</select>
</li>
<li id="domain_dropdown_container" style="display:none">
<label>Domain:</label>
<select class="select" id="domain_dropdown">
</select>
</li>
</ol>
</form>
</div>

36
ui/scripts/cloud.core.resource.js
View File

@ -371,7 +371,34 @@ function initUpdateConsoleCertButton($midMenuAddLink2) {
function initAddZoneButton($midmenuAddLink1) {
$midmenuAddLink1.find("#label").text("Add Zone");
$midmenuAddLink1.show();
$midmenuAddLink1.show();
var $dialogAddZone = $("#dialog_add_zone");
$dialogAddZone.find("#add_zone_public").unbind("change").bind("change", function(event) {
if($(this).val() == "true") { //public zone
$dialogAddZone.find("#domain_dropdown_container").hide();
}
else { //private zone
$dialogAddZone.find("#domain_dropdown_container").show();
}
return false;
});
var domainDropdown = $dialogAddZone.find("#domain_dropdown").empty();
$.ajax({
data: createURL("command=listDomains"+maxPageSize),
dataType: "json",
async: false,
success: function(json) {
var domains = json.listdomainsresponse.domain;
if (domains != null && domains.length > 0) {
for (var i = 0; i < domains.length; i++) {
domainDropdown.append("<option value='" + domains[i].id + "'>" + fromdb(domains[i].name) + "</option>");
}
}
}
});
$midmenuAddLink1.unbind("click").bind("click", function(event) {
$("#dialog_add_zone").find("#info_container").hide();
@ -427,7 +454,12 @@ function initAddZoneButton($midmenuAddLink1) {
var guestcidraddress = trim($thisDialog.find("#add_zone_guestcidraddress").val());
moreCriteria.push("&guestcidraddress="+encodeURIComponent(guestcidraddress));
if($thisDialog.find("#domain_dropdown_container").css("display") != "none") {
var domainId = trim($thisDialog.find("#domain_dropdown").val());
moreCriteria.push("&domainid="+domainId);
}
$.ajax({
data: createURL("command=createZone"+moreCriteria.join("")),
dataType: "json",

4
ui/test/index.html
View File

@ -16,8 +16,8 @@
<link rel= "stylesheet" href="css/cloud_custom.css" type="text/css" />
<!-- Javascripts -->
<script type="text/javascript" src="../scripts/jquery-1.4.2.min.js"></script>
<script type="text/javascript" src="../scripts/jquery-ui-1.8.2.custom.min.js"></script>
<script type="text/javascript" src="../scripts/jquery.min.js"></script>
<script type="text/javascript" src="../scripts/jquery-ui.custom.min.js"></script>
<script type="text/javascript" src="../scripts/date.js"></script>
<script type="text/javascript" src="../scripts/jquery.cookies.js"></script>
<script type="text/javascript" src="../scripts/jquery.timers.js"></script>